pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
corefx-git: Find LIBGSS headers
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Apr 17 17:50:36 2016 +0200
Changeset: e3d7134ba289963fe862fcd35570e896dbb681ef
Modified Files:
corefx-git/distinfo
Added Files:
corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
corefx-git/patches/patch-src_Native_configure.cmake
Log Message:
corefx-git: Find LIBGSS headers
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e3d7134ba289963fe862fcd35570e896dbb681ef
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
corefx-git/distinfo | 2 ++
...ative_System.Net.Security.Native_CMakeLists.txt | 28 ++++++++++++++++++++++
.../patches/patch-src_Native_configure.cmake | 18 ++++++++++++++
3 files changed, 48 insertions(+)
diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index c641c55..167fab1 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1 +1,3 @@
$NetBSD$
+SHA1 (patch-src_Native_System.Net.Security.Native_CMakeLists.txt) = 6f39c82e1d870dbf5b092a7b017727d0cc409886
+SHA1 (patch-src_Native_configure.cmake) = 9428d24bc7c166d6567959d0bcc34ba96446fe42
diff --git a/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt b/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
new file mode 100644
index 0000000..106d045
--- /dev/null
+++ b/corefx-git/patches/patch-src_Native_System.Net.Security.Native_CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- src/Native/System.Net.Security.Native/CMakeLists.txt.orig 2016-04-16 12:43:49.000000000 +0000
++++ src/Native/System.Net.Security.Native/CMakeLists.txt
+@@ -9,11 +9,14 @@ if (HAVE_GSSFW_HEADERS)
+ if(LIBGSS STREQUAL LIBGSS-NOTFOUND)
+ message(FATAL_ERROR "Cannot find GSS.Framework and System.Net.Security.Native cannot build without it. Try installing GSS.Framework (or the appropriate package for your platform)")
+ endif()
++ find_path(LIBGSS_INCLUDE_DIR GSS/GSS.h)
+ else()
+ find_library(LIBGSS NAMES gssapi_krb5)
+ if(LIBGSS STREQUAL LIBGSS-NOTFOUND)
+ message(FATAL_ERROR "Cannot find libgssapi_krb5 and System.Net.Security.Native cannot build without it. Try installing libkrb5-dev (or the appropriate package for your platform)")
+ endif()
++ # Look up for MIT-KRB5 specific header, not available in Heimdal
++ find_path(LIBGSS_INCLUDE_DIR gssapi/gssapi_ext.h)
+ endif()
+
+ set(NATIVEGSS_SOURCES
+@@ -30,4 +33,8 @@ target_link_libraries(System.Net.Securit
+ ${LIBGSS}
+ )
+
++include_directories(SYSTEM
++ ${LIBGSS_INCLUDE_DIR}
++)
++
+ install (TARGETS System.Net.Security.Native DESTINATION .)
diff --git a/corefx-git/patches/patch-src_Native_configure.cmake b/corefx-git/patches/patch-src_Native_configure.cmake
new file mode 100644
index 0000000..02be34b
--- /dev/null
+++ b/corefx-git/patches/patch-src_Native_configure.cmake
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/Native/configure.cmake.orig 2016-04-09 19:53:47.000000000 +0000
++++ src/Native/configure.cmake
+@@ -447,10 +447,13 @@ if (HAVE_GSSFW_HEADERS)
+ "GSS/GSS.h"
+ HAVE_GSS_SPNEGO_MECHANISM)
+ else ()
++ find_path(LIBGSS_INCLUDE_DIR gssapi/gssapi_ext.h)
++ set(CMAKE_REQUIRED_INCLUDES ${LIBGSS_INCLUDE_DIR})
+ check_symbol_exists(
+ GSS_SPNEGO_MECHANISM
+ "gssapi/gssapi.h"
+ HAVE_GSS_SPNEGO_MECHANISM)
++ unset(CMAKE_REQUIRED_INCLUDES)
+ endif ()
+
+ set (CMAKE_REQUIRED_LIBRARIES)
Home |
Main Index |
Thread Index |
Old Index