diff options
| author | jperkin <jperkin> | 2017-03-09 12:45:56 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-03-09 12:45:56 +0000 |
| commit | b4a24040d49b782c32c3ffc9aa1608f98b01c089 (patch) | |
| tree | 847172e6c875d194c1a864636b84532ff3ded5ac /lang | |
| parent | d170eb799f2ded197244199b6220cc12a5f291fa (diff) | |
| download | pkgsrc-b4a24040d49b782c32c3ffc9aa1608f98b01c089.tar.gz | |
Fix library build on SunOS.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/libLLVM/distinfo | 5 | ||||
| -rw-r--r-- | lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc | 16 | ||||
| -rw-r--r-- | lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt | 12 |
3 files changed, 26 insertions, 7 deletions
diff --git a/lang/libLLVM/distinfo b/lang/libLLVM/distinfo index 579f52ce4be..44e26924ce3 100644 --- a/lang/libLLVM/distinfo +++ b/lang/libLLVM/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2017/01/05 11:54:32 adam Exp $ +$NetBSD: distinfo,v 1.8 2017/03/09 12:45:56 jperkin Exp $ SHA1 (llvm-3.9.1.src.tar.xz) = ce801cf456b8dacd565ce8df8288b4d90e7317ff RMD160 (llvm-3.9.1.src.tar.xz) = b0a3c68cfec83a2b4dad6922316b71c0dc25c40a @@ -10,5 +10,6 @@ SHA1 (patch-cmake_modules_CMakeLists.txt) = bf31e9d3914e2041a7d435390b63ad67282b SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b SHA1 (patch-cmake_modules_TableGen.cmake) = d548208577f45fbb6c8f7b43548c399cc63c7887 SHA1 (patch-include_llvm_Support_Host.h) = ad6ac520f15bba96ab887c962fb717e22aaee7bf +SHA1 (patch-lib_Support_Unix_Program.inc) = 49f09e05858243ca57f14b1fdb2fec49c935dfeb SHA1 (patch-tools_llvm-config_llvm-config.cpp) = 44835bfcd2bddc16e0b93628fafb627889091f85 -SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 8f538db138219c2a3ce394b7a3c21f277d5544dd +SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 8faddae24e937ce0b60a7b6a69370c56b9ff7fe3 diff --git a/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc b/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc new file mode 100644 index 00000000000..ec657e0d409 --- /dev/null +++ b/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc @@ -0,0 +1,16 @@ +$NetBSD: patch-lib_Support_Unix_Program.inc,v 1.1 2017/03/09 12:45:56 jperkin Exp $ + +Remove bogus redefine. + +--- lib/Support/Unix/Program.inc.orig 2016-04-05 20:45:04.000000000 +0000 ++++ lib/Support/Unix/Program.inc +@@ -40,9 +40,6 @@ + #include <unistd.h> + #endif + #ifdef HAVE_POSIX_SPAWN +-#ifdef __sun__ +-#define _RESTRICT_KYWD +-#endif + #include <spawn.h> + + #if defined(__APPLE__) diff --git a/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt b/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt index a329781f5fa..a5c8ce5c029 100644 --- a/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt +++ b/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.1 2016/03/08 21:06:50 tnn Exp $ +$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.2 2017/03/09 12:45:56 jperkin Exp $ -Use the Linux style linking everywhere except Darwin. +Use the Linux style linking everywhere except Darwin and SunOS. ---- ./tools/llvm-shlib/CMakeLists.txt.orig 2015-11-04 23:11:12.000000000 +0000 -+++ ./tools/llvm-shlib/CMakeLists.txt -@@ -41,11 +41,10 @@ endif() +--- tools/llvm-shlib/CMakeLists.txt.orig 2016-05-26 04:35:35.000000000 +0000 ++++ tools/llvm-shlib/CMakeLists.txt +@@ -39,11 +39,12 @@ endif() add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) list(REMOVE_DUPLICATES LIB_NAMES) @@ -14,6 +14,8 @@ Use the Linux style linking everywhere except Darwin. -elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) ++elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS") ++ set(LIB_NAMES -Wl,-Bsymbolic -Wl,-z -Wl,allextract ${LIB_NAMES} -Wl,-z -Wl,defaultextract) +else() + set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) endif() |