pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

corefx-git: Fix curl usage



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Mar 4 11:37:24 2016 +0100
Changeset:	6afb12328f4fee9d0e28dc001566bf15419a181a

Modified Files:
	corefx-git/distinfo
Added Files:
	corefx-git/patches/patch-src_Native_System.Net.Http.Native_CMakeLists.txt

Log Message:
corefx-git: Fix curl usage

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6afb12328f4fee9d0e28dc001566bf15419a181a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 corefx-git/distinfo                                |  1 +
 ...rc_Native_System.Net.Http.Native_CMakeLists.txt | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index d85a8e1..23ec282 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 SHA1 (patch-build.sh) = c0e9db60c8f3bfbcc5d4f2f1b2bef92f19d697f4
 SHA1 (patch-run-test.sh) = a50960196fadc4e6d7b6c6f7bbf968b46ff284b4
+SHA1 (patch-src_Native_System.Net.Http.Native_CMakeLists.txt) = 5bb3b50cd1071830585ec5458503d4915e50ab0e
 SHA1 (patch-src_Native_configure.cmake) = 2f9be9b5319a386bffe326cbfb0afd3c4a15b975
 SHA1 (patch-src_Native_gen-buildsys-clang.sh) = 2b90007d86d0c41c1af044cca0ef44591a9a2ecc
 SHA1 (patch-src_System.IO.FileSystem.DriveInfo_tests_System.IO.FileSystem.DriveInfo.Tests.csproj) = 2566a3cb4e92de519569461cae2a2b9b6b6554da
diff --git a/corefx-git/patches/patch-src_Native_System.Net.Http.Native_CMakeLists.txt b/corefx-git/patches/patch-src_Native_System.Net.Http.Native_CMakeLists.txt
new file mode 100644
index 0000000..ccda441
--- /dev/null
+++ b/corefx-git/patches/patch-src_Native_System.Net.Http.Native_CMakeLists.txt
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- src/Native/System.Net.Http.Native/CMakeLists.txt.orig	2016-01-30 00:20:59.000000000 +0000
++++ src/Native/System.Net.Http.Native/CMakeLists.txt
+@@ -1,10 +1,9 @@
+ project(System.Net.Http.Native)
+ 
+-find_library(CURL NAMES curl)
+-if(CURL STREQUAL CURL-NOTFOUND)
+-    message(SEND_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) !!!")
+-    return()
+-endif()
++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)
+ 
+ set(NATIVEHTTP_SOURCES
+     pal_curlinit.cpp
+@@ -14,13 +13,15 @@ set(NATIVEHTTP_SOURCES
+     pal_versioninfo.cpp
+ )
+ 
++include_directories(SYSTEM ${CURL_INCLUDE_DIR})
++
+ add_library(System.Net.Http.Native
+     SHARED
+     ${NATIVEHTTP_SOURCES}
+ )
+ 
+ target_link_libraries(System.Net.Http.Native
+-  ${CURL}
++  ${CURL_LIBRARIES}
+ )
+ 
+ install (TARGETS System.Net.Http.Native DESTINATION .)


Home | Main Index | Thread Index | Old Index