summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD22
-rw-r--r--lttng-uts-40.patch36
3 files changed, 57 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4363ce4bb7a1..5eb4c42b686d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dotnet-cli
pkgdesc = A command line utility for building, testing, packaging and running .NET Core applications and libraries
- pkgver = 1.0.0_preview2_1_003177
- pkgrel = 2
+ pkgver = 1.0.0_rc4_004771
+ pkgrel = 1
url = https://www.microsoft.com/net/core
arch = x86_64
license = MIT
@@ -17,18 +17,20 @@ pkgbase = dotnet-cli
depends = openssl
depends = curl
provides = dotnet
- noextract = dotnet-cli-1.0.0_preview2_1_003177.tar.gz
+ noextract = dotnet-cli-1.0.0_rc4_004771.tar.gz
options = staticlibs
source = coreclr-1.1.0.tar.gz::https://github.com/dotnet/coreclr/archive/v1.1.0.tar.gz
source = corefx-1.1.0.tar.gz::https://github.com/dotnet/corefx/archive/v1.1.0.tar.gz
- source = dotnet-cli-1.0.0_preview2_1_003177.tar.gz::https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/1.0.0-preview2-1-003177/dotnet-dev-fedora.23-x64.1.0.0-preview2-1-003177.tar.gz
+ source = dotnet-cli-1.0.0_rc4_004771.tar.gz::https://go.microsoft.com/fwlink/?linkid=841687
source = llvm-39-github-pull-8311.patch
source = llvm-39-move.patch
+ source = lttng-uts-40.patch
sha256sums = edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444
sha256sums = ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648
- sha256sums = 9802a59b2e68c1fd2c91648503302066bf0ab09b1d286dd6264e2ccc75f50b09
+ sha256sums = 28d26193730257861b2577b0d7855b02772229c356440a9a2e1ccd78769b303e
sha256sums = 581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7
sha256sums = 84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d
+ sha256sums = d7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401
pkgname = dotnet-cli
diff --git a/PKGBUILD b/PKGBUILD
index 517849b3462a..4e819c7253f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,10 @@
-# Maintainer: Aaron Brodersen <aaron at abrodersen dot com>
+# Maintainer: Yurii Kolesnykov
+# Credit: g00d
+# Credit: Aaron Brodersen <aaron at abrodersen dot com>
+
pkgname=dotnet-cli
-pkgver="1.0.0_preview2_1_003177"
-pkgrel=2
+pkgver="1.0.0_rc4_004771"
+pkgrel=1
pkgdesc="A command line utility for building, testing, packaging and running .NET Core applications and libraries"
arch=(x86_64)
url="https://www.microsoft.com/net/core"
@@ -10,7 +13,7 @@ groups=()
depends=('lldb' 'libunwind' 'icu' 'lttng-ust' 'openssl' 'curl')
makedepends=('cmake' 'make' 'clang' 'llvm' 'gettext')
provides=('dotnet')
-conflicts=()
+conflicts=('dotnet-bin')
replaces=()
backup=()
options=(staticlibs)
@@ -27,20 +30,23 @@ _corefx="corefx-${_corefxver}"
source=(
"${_coreclr}.tar.gz::https://github.com/dotnet/coreclr/archive/v${_coreclrver}.tar.gz"
"${_corefx}.tar.gz::https://github.com/dotnet/corefx/archive/v${_corefxver}.tar.gz"
- "${pkgname}-${pkgver}.tar.gz::https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${_sdkver}/dotnet-dev-fedora.23-x64.${_sdkver}.tar.gz"
+ "${pkgname}-${pkgver}.tar.gz::https://go.microsoft.com/fwlink/?linkid=841687"
'llvm-39-github-pull-8311.patch'
- 'llvm-39-move.patch')
+ 'llvm-39-move.patch'
+ 'lttng-uts-40.patch')
noextract=("${pkgname}-${pkgver}.tar.gz")
sha256sums=('edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444'
'ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648'
- '9802a59b2e68c1fd2c91648503302066bf0ab09b1d286dd6264e2ccc75f50b09'
+ '28d26193730257861b2577b0d7855b02772229c356440a9a2e1ccd78769b303e'
'581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7'
- '84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d')
+ '84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d'
+ 'd7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401')
prepare() {
cd "${srcdir}/${_coreclr}"
patch -p1 < "${srcdir}/llvm-39-github-pull-8311.patch"
patch -p1 < "${srcdir}/llvm-39-move.patch"
+ patch -p0 < "${srcdir}/lttng-uts-40.patch"
}
build() {
diff --git a/lttng-uts-40.patch b/lttng-uts-40.patch
new file mode 100644
index 000000000000..6534d0d5339e
--- /dev/null
+++ b/lttng-uts-40.patch
@@ -0,0 +1,36 @@
+diff -Naur src/pal/src/configure.cmake-orig src/pal/src/configure.cmake
+--- src/pal/src/configure.cmake-orig 2016-12-27 09:27:00.480715728 -0500
++++ src/pal/src/configure.cmake 2016-12-27 09:26:28.707299084 -0500
+@@ -13,7 +13,7 @@
+ set(CMAKE_REQUIRED_INCLUDES /opt/local/include)
+ endif()
+ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+- set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
++ set(CMAKE_REQUIRED_DEFINITIONS "-D_BSD_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
+ endif()
+
+ list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_FILE_OFFSET_BITS=64)
+@@ -33,7 +33,15 @@
+ check_include_files(lwp.h HAVE_LWP_H)
+ check_include_files(libunwind.h HAVE_LIBUNWIND_H)
+ check_include_files(runetype.h HAVE_RUNETYPE_H)
++
++if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
++ set(CMAKE_REQUIRED_FLAGS "-ldl")
++endif()
+ check_include_files(lttng/tracepoint.h HAVE_LTTNG_TRACEPOINT_H)
++if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
++ unset(CMAKE_REQUIRED_FLAGS)
++endif()
++
+ check_include_files(uuid/uuid.h HAVE_LIBUUID_H)
+ check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H)
+ check_include_files(gnu/lib-names.h HAVE_GNU_LIBNAMES_H)
+@@ -62,7 +70,6 @@
+ check_function_exists(localtime_r HAVE_LOCALTIME_R)
+ check_function_exists(gmtime_r HAVE_GMTIME_R)
+ check_function_exists(timegm HAVE_TIMEGM)
+-check_function_exists(_snwprintf HAVE__SNWPRINTF)
+ check_function_exists(poll HAVE_POLL)
+ check_function_exists(statvfs HAVE_STATVFS)
+ check_function_exists(thread_self HAVE_THREAD_SELF) \ No newline at end of file