summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Sferrazza2017-05-05 13:35:41 -0400
committerKyle Sferrazza2017-05-05 13:35:41 -0400
commit50e760f12be9230e6b3b16ac5f3a4556ce5daf65 (patch)
tree196dfa1d9af9d42f27dabc75db05f9dda4c1256c
parente1347d0f66f03ca0f32188d8bcc798471e5b1b74 (diff)
downloadaur-50e760f12be9230e6b3b16ac5f3a4556ce5daf65.tar.gz
fixed!
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--openssl-10.patch14
3 files changed, 27 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1dad34f9e45..e2c8a94731f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dotnet
pkgdesc = Provides the .NET core shared framework, i.e. coreclr and corefx.
pkgver = 1.1.1
- pkgrel = 2
+ pkgrel = 3
url = https://www.microsoft.com/net/core
arch = x86_64
license = MIT
@@ -26,6 +26,7 @@ pkgbase = dotnet
source = llvm-39-move.patch
source = lttng-uts-40.patch
source = clang-4-patchset.patch
+ source = openssl-10.patch
sha256sums = 450ffcc9a68eef2e157419d4cc354deb618f80d3f1816fd0c8c99460718dbd85
sha256sums = 83c37233ebe4d37f7c7ff5c7a91c8242704a6526c27c4c59a4967ad67e634c2e
sha256sums = 828af612b3e691f27d93153c3c7fd561e041535e907e9823f206ccab51030ecf
@@ -33,6 +34,7 @@ pkgbase = dotnet
sha256sums = 84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d
sha256sums = d7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401
sha256sums = 2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a
+ sha256sums = b1d3aa07a17bd7d21bc456bf5bf9c612ff97a24980de1b93bb3fffde6584c643
pkgname = dotnet
diff --git a/PKGBUILD b/PKGBUILD
index 8f964d683fe7..4cb97d882138 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=dotnet
pkgver=1.1.1
-pkgrel=2
+pkgrel=3
pkgdesc="Provides the .NET core shared framework, i.e. coreclr and corefx."
arch=(x86_64)
url="https://www.microsoft.com/net/core"
@@ -25,6 +25,7 @@ source=(
'llvm-39-move.patch'
'lttng-uts-40.patch'
'clang-4-patchset.patch'
+ 'openssl-10.patch'
)
sha256sums=('450ffcc9a68eef2e157419d4cc354deb618f80d3f1816fd0c8c99460718dbd85'
'83c37233ebe4d37f7c7ff5c7a91c8242704a6526c27c4c59a4967ad67e634c2e'
@@ -32,7 +33,8 @@ sha256sums=('450ffcc9a68eef2e157419d4cc354deb618f80d3f1816fd0c8c99460718dbd85'
'581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7'
'84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d'
'd7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401'
- '2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a')
+ '2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a'
+ 'b1d3aa07a17bd7d21bc456bf5bf9c612ff97a24980de1b93bb3fffde6584c643')
prepare() {
cd "${srcdir}/coreclr-${pkgver}"
@@ -40,9 +42,15 @@ prepare() {
patch -p1 < "${srcdir}/llvm-39-move.patch"
patch -p0 < "${srcdir}/lttng-uts-40.patch"
patch -p1 < "${srcdir}/clang-4-patchset.patch"
+ cd "${srcdir}/corefx-${pkgver}"
+ patch -p1 < "${srcdir}/openssl-10.patch"
}
build() {
+ export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
+ export _OPENSSL_INCLUDEDIR=/usr/include/openssl-1.0/
+ export _OPENSSL_LIBDIR=/usr/lib/openssl-1.0/
+
cd "${srcdir}/coreclr-${pkgver}"
./build.sh x64 release skiptests
diff --git a/openssl-10.patch b/openssl-10.patch
new file mode 100644
index 000000000000..f47ce79f0d4f
--- /dev/null
+++ b/openssl-10.patch
@@ -0,0 +1,14 @@
+--- old/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt 2017-02-22 11:42:11.000000000 -0500
++++ new/src/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt 2017-05-02 10:21:51.509451435 -0400
+@@ -17,6 +17,11 @@
+
+ find_package(OpenSSL REQUIRED)
+
++include_directories(
++ SYSTEM
++ ${OPENSSL_INCLUDE_DIR}
++)
++
+ set(NATIVECRYPTO_SOURCES
+ openssl.c
+ pal_asn1.cpp