pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coreclr-git: Add patches to pass the configure stage



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jan 21 19:31:31 2016 +0100
Changeset:	8aa4836927e50eb04eefebecb4fab3041fc9afdf

Modified Files:
	coreclr-git/Makefile
Added Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-build.sh
	coreclr-git/patches/patch-run-cppcheck.sh
	coreclr-git/patches/patch-src_pal_src_configure.cmake
	coreclr-git/patches/patch-src_pal_src_loader_module.cpp

Log Message:
coreclr-git: Add patches to pass the configure stage

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

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

diffstat:
 coreclr-git/Makefile                               |  3 ++
 coreclr-git/distinfo                               |  6 ++++
 coreclr-git/patches/patch-build.sh                 | 13 ++++++++
 coreclr-git/patches/patch-run-cppcheck.sh          | 20 ++++++++++++
 .../patches/patch-src_pal_src_configure.cmake      | 38 ++++++++++++++++++++++
 .../patches/patch-src_pal_src_loader_module.cpp    | 13 ++++++++
 6 files changed, 93 insertions(+)

diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index 70b5398..8125c5b 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -26,6 +26,9 @@ SUBST_SED.python=	-e 's,python ,${PYTHONBIN} ,'
 do-build:
 		${RUN} cd ${WRKSRC} && ./build.sh
 
+.include "../../wip/llvm-git/buildlink3.mk"
+.include "../../wip/lldb-git/buildlink3.mk"
+.include "../../wip/clang-git/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
new file mode 100644
index 0000000..793bfe3
--- /dev/null
+++ b/coreclr-git/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (patch-build.sh) = 6489403b0a2ab39d718ff249e93872297c591f95
+SHA1 (patch-run-cppcheck.sh) = 0fc41126112b23aca159bea1c2474e90a6eef322
+SHA1 (patch-src_pal_src_configure.cmake) = ce7fcf8da51c43cf1aba677809a3027f2cab9573
+SHA1 (patch-src_pal_src_loader_module.cpp) = 820de87ead31396d54d5523dd9bc0d6bc210ee4d
diff --git a/coreclr-git/patches/patch-build.sh b/coreclr-git/patches/patch-build.sh
new file mode 100644
index 0000000..8bbed61
--- /dev/null
+++ b/coreclr-git/patches/patch-build.sh
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- build.sh.orig	2016-01-21 18:24:09.000000000 +0000
++++ build.sh
+@@ -129,6 +129,8 @@ build_coreclr()
+     # processors available to a single process.
+     if [ `uname` = "FreeBSD" ]; then
+         NumProc=`sysctl hw.ncpu | awk '{ print $2+1 }'`
++    elif [ `uname` = "NetBSD" ]; then
++        NumProc=$(($(getconf NPROCESSORS_ONLN)+1))
+     else
+         NumProc=$(($(getconf _NPROCESSORS_ONLN)+1))
+     fi
diff --git a/coreclr-git/patches/patch-run-cppcheck.sh b/coreclr-git/patches/patch-run-cppcheck.sh
new file mode 100644
index 0000000..c602b3c
--- /dev/null
+++ b/coreclr-git/patches/patch-run-cppcheck.sh
@@ -0,0 +1,20 @@
+$NetBSD$
+
+--- run-cppcheck.sh.orig	2016-01-18 21:51:38.000000000 +0000
++++ run-cppcheck.sh
+@@ -41,6 +41,8 @@ SloccountOutput="sloccount.sc"
+ # processors available to a single process.
+ if [ `uname` = "FreeBSD" ]; then
+ NumProc=`sysctl hw.ncpu | awk '{ print $2+1 }'`
++elif [ `uname` = "NetBSD" ]; then
++NumProc=$(($(getconf NPROCESSORS_ONLN)+1))
+ else
+ NumProc=$(($(getconf _NPROCESSORS_ONLN)+1))
+ fi
+@@ -114,4 +116,4 @@ then
+ fi
+ 
+ echo Check finished.  Results can be found in: $CppCheckOutputs $SlocCountOutputs
+-exit 0
+\ No newline at end of file
++exit 0
diff --git a/coreclr-git/patches/patch-src_pal_src_configure.cmake b/coreclr-git/patches/patch-src_pal_src_configure.cmake
new file mode 100644
index 0000000..7bc1f41
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_configure.cmake
@@ -0,0 +1,38 @@
+$NetBSD$
+
+--- src/pal/src/configure.cmake.orig	2016-01-18 21:51:39.000000000 +0000
++++ src/pal/src/configure.cmake
+@@ -943,7 +943,27 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBS
+   else()
+     message(FATAL_ERROR "Cannot find libc on this system.")
+   endif()
+-  
++
++elseif(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
++  if(NOT HAVE_LIBUNWIND_H)
++    unset(HAVE_LIBUNWIND_H CACHE)
++    message(WARNING "Cannot find libunwind. Try installing libunwind8 and libunwind8-dev (or the appropriate packages for your platform)")
++  endif()
++  if(NOT HAVE_BSD_UUID_H)
++    unset(HAVE_BSD_UUID_H CACHE)
++    message(FATAL_ERROR "Cannot find uuid.h")
++  endif()
++  set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 0)
++  set(PAL_PTRACE "ptrace((cmd), (pid), (void*)(addr), (data))")
++  set(PAL_PT_ATTACH PT_ATTACH)
++  set(PAL_PT_DETACH PT_DETACH)
++  set(PAL_PT_READ_D PT_READ_D)
++  set(PAL_PT_WRITE_D PT_WRITE_D)
++  set(JA_JP_LOCALE_NAME ja_JP_LOCALE_NOT_FOUND)
++  set(KO_KR_LOCALE_NAME ko_KR_LOCALE_NOT_FOUND)
++  set(ZH_TW_LOCALE_NAME zh_TW_LOCALE_NOT_FOUND)
++  set(HAS_FTRUNCATE_LENGTH_ISSUE 0)
++
+ elseif(CMAKE_SYSTEM_NAME STREQUAL SunOS)
+   if(NOT HAVE_LIBUNWIND_H)
+     unset(HAVE_LIBUNWIND_H CACHE)
+@@ -989,4 +1009,3 @@ else() # Anything else is Linux
+ endif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+-
diff --git a/coreclr-git/patches/patch-src_pal_src_loader_module.cpp b/coreclr-git/patches/patch-src_pal_src_loader_module.cpp
new file mode 100644
index 0000000..2560b3b
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_src_loader_module.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/pal/src/loader/module.cpp.orig	2016-01-18 21:51:39.000000000 +0000
++++ src/pal/src/loader/module.cpp
+@@ -1621,6 +1621,8 @@ static HMODULE LOADLoadLibrary(LPCSTR sh
+         shortAsciiName = "libc.dylib";
+ #elif defined(__FreeBSD__)
+         shortAsciiName = FREEBSD_LIBC;
++#elif defined(__NetBSD__)
++        shortAsciiName = "libc.so";
+ #else
+         shortAsciiName = LIBC_SO;
+ #endif


Home | Main Index | Thread Index | Old Index