kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libLLVM: Darwin rpath fix

Browse source
This commit is contained in:
tnn 2019-01-27 00:07:32 +00:00
parent 107488599f
commit de88f50393
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/libLLVM/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.14 2019/01/26 21:44:34 tnn Exp $
$NetBSD: distinfo,v 1.15 2019/01/27 00:07:32 tnn Exp $
SHA1 (llvm-7.0.1.src.tar.xz) = f97632fcc3186eb0d396492ef8acfc807648580f
RMD160 (llvm-7.0.1.src.tar.xz) = dae96c6f85afb60e73564dc40d02171d01ffdb8f
@ -6,7 +6,7 @@ SHA512 (llvm-7.0.1.src.tar.xz) = ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224
Size (llvm-7.0.1.src.tar.xz) = 28311056 bytes
SHA1 (patch-CMakeLists.txt) = af0dc7f54e5e11c481f78ffafc9a6833e4469f32
SHA1 (patch-cmake_config-ix.cmake) = a345420169e4066e22d28ca6ad10840e83ccfa76
SHA1 (patch-cmake_modules_AddLLVM.cmake) = a580de70bc6d6e2cc6f058ac486c4fcbf8dc9e2b
SHA1 (patch-cmake_modules_AddLLVM.cmake) = e2f84881d23a5c3036acaec97c19480944968cc1
SHA1 (patch-cmake_modules_CMakeLists.txt) = 69514dafb36794eb6923a39ef219bdc7b09c37ee
SHA1 (patch-cmake_modules_CheckAtomic.cmake) = 51e4fdf3bc24b50fc4d4bfa1ec5ba6c82ef946b4
SHA1 (patch-cmake_modules_HandleLLVMOptions.cmake) = 271e6f5a8cebf8162c4e3b758e96f451b434269b

12
lang/libLLVM/patches/patch-cmake_modules_AddLLVM.cmake
View file

@ -1,8 +1,9 @@
$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.7 2019/01/26 21:17:20 tnn Exp $
$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.8 2019/01/27 00:07:32 tnn Exp $
Disable library install rules. Handled manually.
Make sure llvm-config goes in libexec/libLLVM to avoid conflict.
Don't use non-portable -z discard-unused on SunOS.
Don't use relative @rpath in llvm-config on Darwin.
--- cmake/modules/AddLLVM.cmake.orig 2018-08-01 07:51:55.000000000 +0000
+++ cmake/modules/AddLLVM.cmake
@ -48,3 +49,12 @@ Don't use non-portable -z discard-unused on SunOS.
COMPONENT ${name})
if (NOT CMAKE_CONFIGURATION_TYPES)
@@ -1632,7 +1620,7 @@ function(llvm_setup_rpath name)
endif()
if (APPLE)
- set(_install_name_dir INSTALL_NAME_DIR "@rpath")
+ set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib/libLLVM")
set(_install_rpath "@loader_path/../lib" ${extra_libdir})
elseif(UNIX)
set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})