pkgsrc-WIP-changes archive

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

corert-git: Eliminate local patches, merged upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 24 03:53:28 2016 +0100
Changeset:	09e9bd12de1324a0c3d727aa173c6abbd7de8d0a

Modified Files:
	corert-git/distinfo
Removed Files:
	corert-git/patches/patch-build.sh
	corert-git/patches/patch-src_Native_Bootstrap_common.h
	corert-git/patches/patch-src_Native_CMakeLists.txt
	corert-git/patches/patch-src_Native_Runtime_unix_configure.cmake

Log Message:
corert-git: Eliminate local patches, merged upstream

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

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

diffstat:
 corert-git/distinfo                                |  4 ---
 corert-git/patches/patch-build.sh                  | 23 ---------------
 .../patches/patch-src_Native_Bootstrap_common.h    | 15 ----------
 corert-git/patches/patch-src_Native_CMakeLists.txt | 25 ----------------
 .../patch-src_Native_Runtime_unix_configure.cmake  | 33 ----------------------
 5 files changed, 100 deletions(-)

diffs:
diff --git a/corert-git/distinfo b/corert-git/distinfo
index 003c0d2..afc7651 100644
--- a/corert-git/distinfo
+++ b/corert-git/distinfo
@@ -1,6 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-build.sh) = 672ac72639fad7823c6f321f84ca83b94cd2dfeb
-SHA1 (patch-src_Native_Bootstrap_common.h) = 7c8e2a28beabcb94489aad26974493025fd87321
-SHA1 (patch-src_Native_CMakeLists.txt) = 9eb2e3790cf8199a561f295c12547cd2fb1b71d1
-SHA1 (patch-src_Native_Runtime_unix_configure.cmake) = c5ffe7d1b728e054c0173a8d06a6ea40c331e627
diff --git a/corert-git/patches/patch-build.sh b/corert-git/patches/patch-build.sh
deleted file mode 100644
index 775cdd2..0000000
--- a/corert-git/patches/patch-build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- build.sh.orig	2016-01-23 16:33:43.000000000 +0000
-+++ build.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/pkg/bin/bash
- 
- usage()
- {
-@@ -305,6 +305,12 @@ case $OSName in
-         __TestNugetRuntimeId=osx.10.10-x64
-         ;;
- 
-+    NetBSD)
-+        __BuildOS=NetBSD
-+        __ToolNugetRuntimeId=osx.10.10-x64
-+        __TestNugetRuntimeId=osx.10.10-x64
-+        ;;
-+
-     *)
-         echo "Unsupported OS $OSName detected, configuring as if for Linux"
-         __BuildOS=Linux
diff --git a/corert-git/patches/patch-src_Native_Bootstrap_common.h b/corert-git/patches/patch-src_Native_Bootstrap_common.h
deleted file mode 100644
index cc23bc9..0000000
--- a/corert-git/patches/patch-src_Native_Bootstrap_common.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- src/Native/Bootstrap/common.h.orig	2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Bootstrap/common.h
-@@ -23,8 +23,10 @@
- 
- #ifndef WIN32
- #include <pthread.h>
-+#if HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
-+#endif
- 
- using namespace std;
- 
diff --git a/corert-git/patches/patch-src_Native_CMakeLists.txt b/corert-git/patches/patch-src_Native_CMakeLists.txt
deleted file mode 100644
index 96668be..0000000
--- a/corert-git/patches/patch-src_Native_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- src/Native/CMakeLists.txt.orig	2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/CMakeLists.txt
-@@ -48,6 +48,20 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
-     set(CLR_CMAKE_PLATFORM_LINUX 1)
- endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
- 
-+if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+    set(CLR_CMAKE_PLATFORM_UNIX 1)
-+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)
-+        set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1)
-+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
-+        set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1)
-+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
-+        set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64 1)
-+    else()
-+        clr_unknown_arch()
-+    endif()
-+    set(CLR_CMAKE_PLATFORM_NETBSD 1)
-+endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+
- if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-   set(CLR_CMAKE_PLATFORM_UNIX 1)
-   set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1)
diff --git a/corert-git/patches/patch-src_Native_Runtime_unix_configure.cmake b/corert-git/patches/patch-src_Native_Runtime_unix_configure.cmake
deleted file mode 100644
index 10fe70f..0000000
--- a/corert-git/patches/patch-src_Native_Runtime_unix_configure.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
---- src/Native/Runtime/unix/configure.cmake.orig	2016-01-23 11:26:49.000000000 +0000
-+++ src/Native/Runtime/unix/configure.cmake
-@@ -906,6 +906,28 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBS
-     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(USE_SIGNALS_FOR_THREAD_SUSPENSION 1)
-+  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)
-+
- else() # Anything else is Linux
-   if(NOT HAVE_LIBUNWIND_H)
-     unset(HAVE_LIBUNWIND_H CACHE)


Home | Main Index | Thread Index | Old Index