svn commit: r432649 - head/devel/llvm40/files

Brooks Davis brooks at FreeBSD.org
Sat Jan 28 20:37:57 UTC 2017


Author: brooks
Date: Sat Jan 28 20:37:55 2017
New Revision: 432649
URL: https://svnweb.freebsd.org/changeset/ports/432649

Log:
  Correct a broken patch.

Modified:
  head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt

Modified: head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt
==============================================================================
--- head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt	Sat Jan 28 19:57:50 2017	(r432648)
+++ head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt	Sat Jan 28 20:37:55 2017	(r432649)
@@ -1,13 +1,14 @@
-Otherwise we end up with a 4k library without any symbols.
 
---- tools/llvm-shlib/CMakeLists.txt.orig	2016-05-26 06:35:35.000000000 +0200
-+++ tools/llvm-shlib/CMakeLists.txt	2016-11-15 17:07:29.937965000 +0100
-@@ -39,7 +39,7 @@
+$FreeBSD$
+
+--- tools/llvm-shlib/CMakeLists.txt.orig
++++ tools/llvm-shlib/CMakeLists.txt
+@@ -37,7 +37,7 @@
  add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})
  
  list(REMOVE_DUPLICATES LIB_NAMES)
--if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
-+if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf"
+-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"
++if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly") OR MINGW) # FIXME: It should be "GNU ld for elf"
    # GNU ld doesn't resolve symbols in the version script.
    set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")


More information about the svn-ports-all mailing list