Fix OpenSSL and libciurl

3 files changed, 37 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e1efbc9e126..175f8b714928 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
@@ -14,8 +14,7 @@ pkgbase = dotnet
 	depends = libunwind
 	depends = icu
 	depends = lttng-ust
-	depends = openssl
-	depends = curl
+	depends = libcurl-openssl-1.0
 	provides = dotnet=1.1.1
 	conflicts = dotnet-bin
 	options = staticlibs
@@ -26,6 +25,7 @@ pkgbase = dotnet
 	source = llvm-39-move.patch
 	source = lttng-uts-40.patch
 	source = clang-4-patchset.patch
+	source = libcurl.patch
 	sha256sums = 450ffcc9a68eef2e157419d4cc354deb618f80d3f1816fd0c8c99460718dbd85
 	sha256sums = 83c37233ebe4d37f7c7ff5c7a91c8242704a6526c27c4c59a4967ad67e634c2e
 	sha256sums = 828af612b3e691f27d93153c3c7fd561e041535e907e9823f206ccab51030ecf
@@ -33,6 +33,7 @@ pkgbase = dotnet
 	sha256sums = 84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d
 	sha256sums = d7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401
 	sha256sums = 2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a
+	sha256sums = a32dea005f5379ae59d31e579f4ea13bad03228a8ca39b439b94767541c44450
 
 pkgname = dotnet
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e3111cb90a7..b1bb0e930336 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 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"
 license=('MIT')
 groups=()
-depends=('lldb' 'libunwind' 'icu' 'lttng-ust' 'openssl' 'curl')
+depends=('lldb' 'libunwind' 'icu' 'lttng-ust' 'libcurl-openssl-1.0')
 makedepends=('cmake' 'make' 'clang' 'llvm' 'gettext')
 provides=('dotnet=1.1.1')
 conflicts=('dotnet-bin')
@@ -25,14 +25,16 @@ source=(
   'llvm-39-move.patch'
   'lttng-uts-40.patch'
   'clang-4-patchset.patch'
-)
+  'libcurl.patch')
+
 sha256sums=('450ffcc9a68eef2e157419d4cc354deb618f80d3f1816fd0c8c99460718dbd85'
             '83c37233ebe4d37f7c7ff5c7a91c8242704a6526c27c4c59a4967ad67e634c2e'
             '828af612b3e691f27d93153c3c7fd561e041535e907e9823f206ccab51030ecf'
             '581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7'
             '84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d'
             'd7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401'
-            '2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a')
+            '2b884b4cd850027f95cba5deda32226e27ceaa962f0ab2879adc5180cf37c32a'
+            'a32dea005f5379ae59d31e579f4ea13bad03228a8ca39b439b94767541c44450')
 
 prepare() {
   cd "${srcdir}/coreclr-${pkgver}"
@@ -40,6 +42,9 @@ 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 -p0 < "${srcdir}/libcurl.patch"
 }
 
 build() {
@@ -47,7 +52,7 @@ build() {
   ./build.sh x64 release skiptests
 
   cd "${srcdir}/corefx-${pkgver}"
-  ./src/Native/build-native.sh x64 release
+  CPLUS_INCLUDE_PATH=/usr/include/openssl-1.0 C_INCLUDE_PATH=/usr/include/openssl-1.0 ./src/Native/build-native.sh x64 release cmakeargs -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 cmakeargs -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so cmakeargs -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so cmakeargs -DCURL_LIBRARIES=/usr/lib/openssl-1.0/libcurl.so
 }
 
 _coreclr_files=(
diff --git a/libcurl.patch b/libcurl.patch
new file mode 100644
index 000000000000..fec517978523
--- /dev/null
+++ b/libcurl.patch
@@ -0,0 +1,23 @@
+*** src/Native/Unix/System.Net.Http.Native/CMakeLists.txt.orig	2017-05-04 21:14:29.817439384 -0700
+--- src/Native/Unix/System.Net.Http.Native/CMakeLists.txt	2017-05-04 21:14:43.417017513 -0700
+***************
+*** 1,9 ****
+  project(System.Net.Http.Native)
+  
+! find_package(CURL)
+! if(NOT CURL_FOUND)
+!     message(FATAL_ERROR "!!! Cannot find libcurl and System.Net.Http.Native cannot build without it. Try installing libcurl4-openssl-dev (or the appropriate package for your platform) !!!")
+! endif(NOT CURL_FOUND)
+  
+  if(CMAKE_STATIC_LIB_LINK)
+      find_library(CURL_STATIC_LIB NAMES libcurl.a)
+--- 1,9 ----
+  project(System.Net.Http.Native)
+  
+! #find_package(CURL)
+! #if(NOT CURL_FOUND)
+! #    message(FATAL_ERROR "!!! Cannot find libcurl and System.Net.Http.Native cannot build without it. Try installing libcurl4-openssl-dev (or the appropriate package for your platform) !!!")
+! #endif(NOT CURL_FOUND)
+  
+  if(CMAKE_STATIC_LIB_LINK)
+      find_library(CURL_STATIC_LIB NAMES libcurl.a)