coreclr-git: More CMake sugar for NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: coreclr-git: More CMake sugar for NetBSD
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sun, 14 Feb 2016 03:03:16 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Feb 14 04:03:16 2016 +0100
Changeset:	a604c29bf39dabd33546b2f7cf8cbc6f94da1535

Modified Files:
	coreclr-git/distinfo
Added Files:
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
	coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt

Log Message:
coreclr-git: More CMake sugar for NetBSD

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

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

diffstat:
 coreclr-git/distinfo                               |  6 ++++
 .../patch-src_ToolBox_SOS_Strike_CMakeLists.txt    | 20 +++++++++++++
 .../patches/patch-src_dlls_dbgshim_CMakeLists.txt  | 18 +++++++++++
 .../patches/patch-src_dlls_mscordac_CMakeLists.txt | 22 ++++++++++++++
 .../patches/patch-src_dlls_mscordbi_CMakeLists.txt | 35 ++++++++++++++++++++++
 .../patch-src_dlls_mscoree_coreclr_CMakeLists.txt  | 22 ++++++++++++++
 ...ception__handling_pal__sxs_test1_CMakeLists.txt | 33 ++++++++++++++++++++
 7 files changed, 156 insertions(+)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 30b0088..a6257b0 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,7 +1,13 @@
 $NetBSD$
 
+SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = c0abf4678a2b6f3d4589444f56efdff3aa8227de
+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_mscoree_coreclr_CMakeLists.txt) = 50339aa1e75d76ef1e9d24c149bc8749c2bea240
 SHA1 (patch-src_gc_gc.cpp) = c468a34bbafe35dcd242065762ff042a94152e47
 SHA1 (patch-src_pal_src_misc_miscpalapi.cpp) = b7a902309081c9a1a4d7a8a4dcfbb11342c7e311
+SHA1 (patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt) = c3974175fce11c46ecc60ca75b4b5959e6e79a9b
 SHA1 (patch-src_vm_amd64_externalmethodfixupthunk.S) = 5e84b369f30ea62e391e1f949d0d01e1995e5192
 SHA1 (patch-src_vm_amd64_jithelpers__fast.S) = b4002abaed826b673c0af58a818c25d6b17e488e
 SHA1 (patch-src_vm_amd64_pinvokestubs.S) = 344e94f87fc08edde9a61f74a495e3bd2ed11248
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
new file mode 100644
index 0000000..3fc74bb
--- /dev/null
+++ b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- src/ToolBox/SOS/Strike/CMakeLists.txt.orig	2016-02-01 23:37:48.000000000 +0000
++++ src/ToolBox/SOS/Strike/CMakeLists.txt
+@@ -1,10 +1,12 @@
+ # 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(CLR_CMAKE_PLATFORM_DARWIN)
+     set(CMAKE_INSTALL_RPATH "@loader_path")
+-else()
++  else()
+     set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+-endif(CLR_CMAKE_PLATFORM_DARWIN)
++  endif(CLR_CMAKE_PLATFORM_DARWIN)
++endif (NOT DEFINED CMAKE_INSTALL_RPATH)
+ 
+ if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
+   add_definitions(-DSOS_TARGET_AMD64=1)
diff --git a/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
new file mode 100644
index 0000000..856abd2
--- /dev/null
+++ b/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- src/dlls/dbgshim/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
++++ src/dlls/dbgshim/CMakeLists.txt
+@@ -24,11 +24,11 @@ if(CLR_CMAKE_PLATFORM_UNIX)
+     add_compile_options(-fPIC)
+ endif(CLR_CMAKE_PLATFORM_UNIX)
+ 
+-if(CLR_CMAKE_PLATFORM_LINUX)
++if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+     # This option is necessary to ensure that the overloaded delete operator defined inside
+     # of the utilcode will be used instead of the standard library delete operator.
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
+-endif(CLR_CMAKE_PLATFORM_LINUX)
++endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+ 
+ add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES})
+ 
diff --git a/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
new file mode 100644
index 0000000..7cee78b2
--- /dev/null
+++ b/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/dlls/mscordac/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
++++ src/dlls/mscordac/CMakeLists.txt
+@@ -30,7 +30,7 @@ if(WIN32)
+     set(START_LIBRARY_GROUP)
+     set(END_LIBRARY_GROUP)
+ else(WIN32)
+-    if(CLR_CMAKE_PLATFORM_LINUX)
++    if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+         # This option is necessary to ensure that the overloaded delete operator defined inside
+         # of the utilcode will be used instead of the standard library delete operator.
+         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
+@@ -39,7 +39,7 @@ else(WIN32)
+         # ensure proper resolving of circular references between a subset of the libraries.
+         set(START_LIBRARY_GROUP -Wl,--start-group)
+         set(END_LIBRARY_GROUP -Wl,--end-group)
+-    endif(CLR_CMAKE_PLATFORM_LINUX)
++    endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+ endif(WIN32)
+ 
+ add_library_clr(mscordaccore SHARED ${CLR_DAC_SOURCES})
diff --git a/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
new file mode 100644
index 0000000..0577923
--- /dev/null
+++ b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
@@ -0,0 +1,35 @@
+$NetBSD$
+
+--- src/dlls/mscordbi/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
++++ src/dlls/mscordbi/CMakeLists.txt
+@@ -1,11 +1,13 @@
+ 
+ # 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(CLR_CMAKE_PLATFORM_DARWIN)
+     set(CMAKE_INSTALL_RPATH "@loader_path")
+-else()
++  else()
+     set(CMAKE_INSTALL_RPATH "\$ORIGIN")
+-endif(CLR_CMAKE_PLATFORM_DARWIN)
++  endif(CLR_CMAKE_PLATFORM_DARWIN)
++endif(NOT DEFINED CMAKE_INSTALL_RPATH)
+ 
+ set(MSCORDBI_SOURCES
+   mscordbi.cpp
+@@ -65,11 +67,11 @@ if(WIN32)
+ 
+ elseif(CLR_CMAKE_PLATFORM_UNIX)
+ 
+-    if(CLR_CMAKE_PLATFORM_LINUX)
++    if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+         # This option is necessary to ensure that the overloaded new/delete operators defined inside
+         # of the utilcode will be used instead of the standard library delete operator.
+         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")    
+-    endif(CLR_CMAKE_PLATFORM_LINUX)
++    endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
+ 
+     list(APPEND COREDBI_LIBRARIES
+         mdhotdata_full
diff --git a/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
new file mode 100644
index 0000000..8be9b8e
--- /dev/null
+++ b/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/dlls/mscoree/coreclr/CMakeLists.txt.orig	2016-01-31 18:28:53.000000000 +0000
++++ src/dlls/mscoree/coreclr/CMakeLists.txt
+@@ -15,7 +15,7 @@ else()
+     set(EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/coreclr.exports)
+     generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE})
+ 
+-    if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++    if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+         # This option is necessary to ensure that the overloaded delete operator defined inside
+         # of the utilcode will be used instead of the standard library delete operator.
+         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
+@@ -30,7 +30,7 @@ else()
+         set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive) 
+ 
+         set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE})
+-    endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++    endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+ 
+     if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+         # These options are used to force every object to be included even if it's unused.
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt
new file mode 100644
index 0000000..fa0084c
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD$
+
+--- src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt.orig	2016-01-18 21:51:39.000000000 +0000
++++ src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
+@@ -14,9 +14,9 @@ convert_to_absolute_path(DEF_SOURCES1 ${
+ set(EXPORTS_FILE1 ${CMAKE_CURRENT_BINARY_DIR}/dlltest1.exports)
+ generate_exports_file(${DEF_SOURCES1} ${EXPORTS_FILE1})
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+     set(EXPORTS_LINKER_OPTION1 -Wl,--version-script=${EXPORTS_FILE1})
+-endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+     set(EXPORTS_LINKER_OPTION1 -Wl,-exported_symbols_list,${EXPORTS_FILE1})
+@@ -46,9 +46,9 @@ convert_to_absolute_path(DEF_SOURCES2 ${
+ set(EXPORTS_FILE2 ${CMAKE_CURRENT_BINARY_DIR}/dlltest2.exports)
+ generate_exports_file(${DEF_SOURCES2} ${EXPORTS_FILE2})
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+     set(EXPORTS_LINKER_OPTION2 -Wl,--version-script=${EXPORTS_FILE2})
+-endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
++endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+     set(EXPORTS_LINKER_OPTION2 -Wl,-exported_symbols_list,${EXPORTS_FILE2})
+@@ -86,4 +86,3 @@ target_link_libraries(paltest_pal_sxs_te
+    paltest_pal_sxs_test1_dll1
+    paltest_pal_sxs_test1_dll2
+ )
+-
Prev by Date: Import htop-2.0.0 as wip/htop
Next by Date: kf5: update to Frameworks 5.19.0
Previous by Thread: Import htop-2.0.0 as wip/htop
Next by Thread: kf5: update to Frameworks 5.19.0
Indexes:
Home | Main Index | Thread Index | Old Index