CVS commit: pkgsrc/lang/libLLVM

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Mar  9 12:45:56 UTC 2017

Modified Files:
        pkgsrc/lang/libLLVM: distinfo
        pkgsrc/lang/libLLVM/patches: patch-tools_llvm-shlib_CMakeLists.txt
Added Files:
        pkgsrc/lang/libLLVM/patches: patch-lib_Support_Unix_Program.inc

Log Message:
Fix library build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/libLLVM/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt

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

Modified files:

Index: pkgsrc/lang/libLLVM/distinfo
diff -u pkgsrc/lang/libLLVM/distinfo:1.7 pkgsrc/lang/libLLVM/distinfo:1.8
--- pkgsrc/lang/libLLVM/distinfo:1.7    Thu Jan  5 11:54:32 2017
+++ pkgsrc/lang/libLLVM/distinfo        Thu Mar  9 12:45:56 2017
@@ -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
 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

Index: pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt
diff -u pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.1 pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.2
--- pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt:1.1       Tue Mar  8 21:06:50 2016
+++ pkgsrc/lang/libLLVM/patches/patch-tools_llvm-shlib_CMakeLists.txt   Thu Mar  9 12:45:56 2017
@@ -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 e
 -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()

Added files:

Index: pkgsrc/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc
diff -u /dev/null pkgsrc/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc:1.1
--- /dev/null   Thu Mar  9 12:45:56 2017
+++ pkgsrc/lang/libLLVM/patches/patch-lib_Support_Unix_Program.inc      Thu Mar  9 12:45:56 2017
@@ -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__)