coreclr-git: Improve RPATH handling

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Feb 14 17:24:23 2016 +0100
Changeset:	a05b37d25bd3a87194cbb7ac27c3d046b4a40c45

Modified Files:
	coreclr-git/Makefile
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
Added Files:
	coreclr-git/patches/patch-CMakeLists.txt
	coreclr-git/patches/patch-src_pal_src_CMakeLists.txt

Log Message:
coreclr-git: Improve RPATH handling

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a05b37d25bd3a87194cbb7ac27c3d046b4a40c45

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

diffstat:
 coreclr-git/Makefile                                  |  2 ++
 coreclr-git/distinfo                                  |  6 ++++--
 coreclr-git/patches/patch-CMakeLists.txt              | 19 +++++++++++++++++++
 .../patch-src_ToolBox_SOS_Strike_CMakeLists.txt       |  4 ++--
 .../patches/patch-src_dlls_mscordbi_CMakeLists.txt    |  4 ++--
 coreclr-git/patches/patch-src_pal_src_CMakeLists.txt  | 17 +++++++++++++++++
 6 files changed, 46 insertions(+), 6 deletions(-)

diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index 2e11e5e..d262fd0 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -21,6 +21,8 @@ REPLACE_BASH+=	build.sh
 
 DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
+CMAKE_ARGS+=	-DCORECLR_SET_RPATH:BOOL=OFF
+
 do-configure:
 	${RUN} ${ECHO} Skip configure and call CMake via build.sh
 
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index b1473a1..f942391 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,11 +1,13 @@
 $NetBSD$
 
-SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = c0abf4678a2b6f3d4589444f56efdff3aa8227de
+SHA1 (patch-CMakeLists.txt) = 621111492c3199019a61a3a98aa98653c6a064b7
+SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = 7180a842fdf944a42354f715e98360849def355d
 SHA1 (patch-src_dlls_dbgshim_CMakeLists.txt) = 324a00675b196a5385ab9c08bf3563ef94410b3e
 SHA1 (patch-src_dlls_mscordac_CMakeLists.txt) = b6cb6eccb95906cc937528aa665ec8838bf47408
-SHA1 (patch-src_dlls_mscordbi_CMakeLists.txt) = e426383ed88d49d127b4f2a1180e72356a3906f7
+SHA1 (patch-src_dlls_mscordbi_CMakeLists.txt) = 8f45e41ebbaf724b129b0bec434deb76692a7fd7
 SHA1 (patch-src_dlls_mscoree_coreclr_CMakeLists.txt) = 50339aa1e75d76ef1e9d24c149bc8749c2bea240
 SHA1 (patch-src_pal_inc_pal.h) = b2cf698debe62fb081ecfd54d97c3a1328f7621d
+SHA1 (patch-src_pal_src_CMakeLists.txt) = 3a20f2cf944f1f2adb9725693d8204dd1d7628d4
 SHA1 (patch-src_pal_src_configure.cmake) = 653871e6b95e78ee2812d936bce989095d348cd9
 SHA1 (patch-src_pal_src_cruntime_misc.cpp) = cbef115e6bcbd9166105b25362d7f64729676dcf
 SHA1 (patch-src_pal_src_include_pal_misc.h) = 08ebba414b6579c2ca62b04dccb78d388dd9641a
diff --git a/coreclr-git/patches/patch-CMakeLists.txt b/coreclr-git/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..89fbe40
--- /dev/null
+++ b/coreclr-git/patches/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2016-02-07 16:07:05.000000000 +0000
++++ CMakeLists.txt
+@@ -4,8 +4,12 @@ cmake_minimum_required(VERSION 2.8.12)
+ # Set the project name
+ project(CoreCLR)
+ 
+-# Enable @rpath support for shared libraries.
+-set(MACOSX_RPATH ON)
++set(CORECLR_SET_RPATH:BOOL ON)
++
++if(CORECLR_SET_RPATH)
++    # Enable @rpath support for shared libraries.
++    set(MACOSX_RPATH ON)
++endif(CORECLR_SET_RPATH)
+ 
+ if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0)
+     cmake_policy(SET CMP0042 NEW)
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
index 3fc74bb..b156a19 100644
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
@@ -6,7 +6,7 @@ $NetBSD$
  # Set the RPATH of sos so that it can find dependencies without needing to set LD_LIBRARY_PATH
  # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
 -if(CLR_CMAKE_PLATFORM_DARWIN)
-+if (NOT DEFINED CMAKE_INSTALL_RPATH)
++if (CORECLR_SET_RPATH)
 +  if(CLR_CMAKE_PLATFORM_DARWIN)
      set(CMAKE_INSTALL_RPATH "@loader_path")
 -else()
@@ -14,7 +14,7 @@ $NetBSD$
      set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 -endif(CLR_CMAKE_PLATFORM_DARWIN)
 +  endif(CLR_CMAKE_PLATFORM_DARWIN)
-+endif (NOT DEFINED CMAKE_INSTALL_RPATH)
++endif (CORECLR_SET_RPATH)
  
  if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
    add_definitions(-DSOS_TARGET_AMD64=1)
diff --git a/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
index 0577923..97d3607 100644
--- a/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
@@ -7,7 +7,7 @@ $NetBSD$
  # Set the RPATH of mscordbi so that it can find dependencies without needing to set LD_LIBRARY_PATH
  # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling.
 -if(CLR_CMAKE_PLATFORM_DARWIN)
-+if(NOT DEFINED CMAKE_INSTALL_RPATH)
++if(CORECLR_SET_RPATH)
 +  if(CLR_CMAKE_PLATFORM_DARWIN)
      set(CMAKE_INSTALL_RPATH "@loader_path")
 -else()
@@ -15,7 +15,7 @@ $NetBSD$
      set(CMAKE_INSTALL_RPATH "\$ORIGIN")
 -endif(CLR_CMAKE_PLATFORM_DARWIN)
 +  endif(CLR_CMAKE_PLATFORM_DARWIN)
-+endif(NOT DEFINED CMAKE_INSTALL_RPATH)
++endif(CORECLR_SET_RPATH)
  
  set(MSCORDBI_SOURCES
    mscordbi.cpp
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
new file mode 100644
index 0000000..136d797
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/pal/src/CMakeLists.txt.orig	2016-02-06 02:05:27.000000000 +0000
++++ src/pal/src/CMakeLists.txt
+@@ -8,8 +8,10 @@ project(coreclrpal)
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+-# Enable @rpath support for shared libraries.
+-set(MACOSX_RPATH ON)
++if(CORECLR_SET_RPATH)
++    # Enable @rpath support for shared libraries.
++    set(MACOSX_RPATH ON)
++endif(CORECLR_SET_RPATH)
+ 
+ if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0)
+     cmake_policy(SET CMP0042 NEW)