[pkgsrc/trunk]: pkgsrc/lang/rust lang/rust: Make llvm build on Darwin

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d032ad0aaef
branches:  trunk
changeset: 385627:1d032ad0aaef
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Sep 24 03:42:42 2018 +0000

description:
lang/rust: Make llvm build on Darwin

Patch from lang/llvm.

diffstat:

 lang/rust/distinfo                                           |   4 ++--
 lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake |  12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r f961331cca8c -r 1d032ad0aaef lang/rust/distinfo
--- a/lang/rust/distinfo        Mon Sep 24 02:28:58 2018 +0000
+++ b/lang/rust/distinfo        Mon Sep 24 03:42:42 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2018/09/14 10:04:43 jperkin Exp $
+$NetBSD: distinfo,v 1.37 2018/09/24 03:42:42 minskim Exp $
 
 SHA1 (rust-1.28.0-i686-apple-darwin.tar.gz) = 85d947b4d260361f63f77e1f4921ac89bd849d78
 RMD160 (rust-1.28.0-i686-apple-darwin.tar.gz) = 963abf1b0b5e2673c8e2d6c1b4d5a2d8ed9d8d2f
@@ -79,7 +79,7 @@
 SHA1 (patch-src_libstd_build.rs) = 32dad8a474300f9f37bce8b92acca762cf8cc4ab
 SHA1 (patch-src_libstd_sys_unix_thread.rs) = 46ef46365658e2f895bd3dde9c74f352890e9ccc
 SHA1 (patch-src_llvm_CMakeLists.txt) = ffdf4337fdc84d8314c97c4e492e6b84244a99d1
-SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 166af9a52d4863b6d99f37b3cce7c154625f2a8b
+SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = f0620ac62ecfb1d62d2dfa61b4c063d21c29b8f5
 SHA1 (patch-src_llvm_include_llvm-c_DataTypes.h) = 432693204912e79059ee31e815ad1e24f3236374
 SHA1 (patch-src_llvm_include_llvm_Analysis_ConstantFolding.h) = 861089ea7ec8985b9b9fce53ffadfa3e9eed4a72
 SHA1 (patch-src_vendor_libc_src_unix_solaris_mod.rs) = 785263f25535c6644a674ca931e2591938b2d2f6
diff -r f961331cca8c -r 1d032ad0aaef lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
--- a/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake      Mon Sep 24 02:28:58 2018 +0000
+++ b/lang/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake      Mon Sep 24 03:42:42 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.2 2018/09/14 10:04:43 jperkin Exp $
+$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.3 2018/09/24 03:42:42 minskim Exp $
 
 "-z discard-unused" is only supported by Oracle Solaris ld.
+On Darwin, use correct install-name for shared libraries.
 
 --- src/llvm/cmake/modules/AddLLVM.cmake.orig  2018-08-01 16:32:37.000000000 +0000
 +++ src/llvm/cmake/modules/AddLLVM.cmake
@@ -13,3 +14,12 @@
        elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
          # Object files are compiled with -ffunction-data-sections.
          # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks
+@@ -1602,7 +1600,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")
+     set(_install_rpath "@loader_path/../lib" ${extra_libdir})
+   elseif(UNIX)
+     set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})