diff options
author | Max Liebkies | 2017-03-08 12:13:55 +0100 |
---|---|---|
committer | Max Liebkies | 2017-03-08 12:13:55 +0100 |
commit | b088acf3fafa9d184edfdf0ec2a8e4b1a27cfc0b (patch) | |
tree | 478431b32754dd0f8287b3c744a5ce0902a32ee2 | |
parent | b39e67c6a6e77a79224c78e3705fc21de44bc69c (diff) | |
download | aur-b088acf3fafa9d184edfdf0ec2a8e4b1a27cfc0b.tar.gz |
Split packages and update to final
-rw-r--r-- | .SRCINFO | 39 | ||||
-rw-r--r-- | PKGBUILD | 117 | ||||
-rw-r--r-- | fix-dtor-call.patch | 25 | ||||
-rw-r--r-- | fix-readdir-on-glibc-2.24.patch | 122 | ||||
-rw-r--r-- | llvm-39-github-pull-8311.patch | 180 | ||||
-rw-r--r-- | llvm-39-move.patch | 28 | ||||
-rw-r--r-- | lttng-uts-40.patch | 36 | ||||
-rw-r--r-- | no-libstdcpp-wrappers-for-stdlib.patch | 25 |
8 files changed, 16 insertions, 556 deletions
@@ -1,46 +1,17 @@ pkgbase = dotnet-cli pkgdesc = A command line utility for building, testing, packaging and running .NET Core applications and libraries - pkgver = 1.0.0_rc4_004771 + pkgver = 1.0.1 pkgrel = 1 epoch = 1 url = https://www.microsoft.com/net/core arch = x86_64 license = MIT - makedepends = cmake - makedepends = clang - makedepends = llvm - depends = lldb - depends = libunwind - depends = icu - depends = lttng-ust - depends = openssl - depends = curl - provides = dotnet + depends = dotnet + optdepends = dotnet-sdk: enable building applications conflicts = dotnet-bin - noextract = dotnet-cli-1.0.0_rc4_004771.tar.gz options = staticlibs - source = coreclr-1.1.0.tar.gz::https://github.com/dotnet/coreclr/archive/v1.1.0.tar.gz - source = coreclr-1.0.5.tar.gz::https://github.com/dotnet/coreclr/archive/v1.0.5.tar.gz - source = corefx-1.1.0.tar.gz::https://github.com/dotnet/corefx/archive/v1.1.0.tar.gz - source = corefx-1.0.3.tar.gz::https://github.com/dotnet/corefx/archive/v1.0.3.tar.gz - source = dotnet-cli-1.0.0_rc4_004771.tar.gz::https://go.microsoft.com/fwlink/?linkid=841687 - source = llvm-39-github-pull-8311.patch - source = llvm-39-move.patch - source = lttng-uts-40.patch - source = no-libstdcpp-wrappers-for-stdlib.patch - source = fix-dtor-call.patch - source = fix-readdir-on-glibc-2.24.patch - sha256sums = edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444 - sha256sums = 8a097a99cc50d08bd601d523b6d8f4cf5b68047b360ce3800f80b90e9a276bcd - sha256sums = ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648 - sha256sums = b6f08b11cb6186f499a7e5e8cb5ad978daef8e64f4ebbd544ff4b05db9627612 - sha256sums = 28d26193730257861b2577b0d7855b02772229c356440a9a2e1ccd78769b303e - sha256sums = 581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7 - sha256sums = 84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d - sha256sums = d7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401 - sha256sums = 8e97cb867f958170fe3613921965ef1c56d282e22c5ba8ff6687ed52b9fabf01 - sha256sums = 987d68c4ca5c5839773df292c76e2e044bc628118b96f1c80fcca55122cea1cb - sha256sums = 48005c5afda97770db17265285348cc059d414fff58354b690a4827fa755fc73 + source = dotnet-cli-1.0.1.tar.gz::https://go.microsoft.com/fwlink/?LinkID=843436 + sha256sums = d2d439fd7e544e120db4fb7246ec99cad199ad8d827a78e3e4157f8e331aa066 pkgname = dotnet-cli @@ -4,128 +4,33 @@ # Credit: Aaron Brodersen <aaron at abrodersen dot com> pkgname=dotnet-cli -pkgver="1.0.0_rc4_004771" +pkgver="1.0.1" pkgrel=1 epoch=1 pkgdesc="A command line utility for building, testing, packaging and running .NET Core applications and libraries" arch=(x86_64) url="https://www.microsoft.com/net/core" license=('MIT') -depends=('lldb' 'libunwind' 'icu' 'lttng-ust' 'openssl' 'curl') -makedepends=('cmake' 'clang' 'llvm') -provides=('dotnet') +depends=('dotnet') +optdepends=('dotnet-sdk: enable building applications') conflicts=('dotnet-bin') options=('staticlibs') -install= -_coreclrver11="1.1.0" -_coreclrver10="1.0.5" +source=("${pkgname}-${pkgver}.tar.gz::https://go.microsoft.com/fwlink/?LinkID=843436") -_corefxver11="1.1.0" -_corefxver10="1.0.3" - -source=( - "coreclr-${_coreclrver11}.tar.gz::https://github.com/dotnet/coreclr/archive/v${_coreclrver11}.tar.gz" - "coreclr-${_coreclrver10}.tar.gz::https://github.com/dotnet/coreclr/archive/v${_coreclrver10}.tar.gz" - "corefx-${_corefxver11}.tar.gz::https://github.com/dotnet/corefx/archive/v${_corefxver11}.tar.gz" - "corefx-${_corefxver10}.tar.gz::https://github.com/dotnet/corefx/archive/v${_corefxver10}.tar.gz" - "${pkgname}-${pkgver}.tar.gz::https://go.microsoft.com/fwlink/?linkid=841687" - 'llvm-39-github-pull-8311.patch' - 'llvm-39-move.patch' - 'lttng-uts-40.patch' - 'no-libstdcpp-wrappers-for-stdlib.patch' - 'fix-dtor-call.patch' - 'fix-readdir-on-glibc-2.24.patch') -noextract=("${pkgname}-${pkgver}.tar.gz") -sha256sums=('edc1e416f07a71e2b3f70c1f1412e45a7396b3f0daac5bcb267d5f779b9d7444' - '8a097a99cc50d08bd601d523b6d8f4cf5b68047b360ce3800f80b90e9a276bcd' - 'ca48ad090c72129ef145ef9b414767408a8fc1249e94a14dc6d4255b1e0b8648' - 'b6f08b11cb6186f499a7e5e8cb5ad978daef8e64f4ebbd544ff4b05db9627612' - '28d26193730257861b2577b0d7855b02772229c356440a9a2e1ccd78769b303e' - '581d6484626bbae820feb19d0613955fea333c025fb06d43a731a3db776686f7' - '84a0e56d00fd2f3f9f82b7d017652f03d4e7f80c6968d7fa1274f6e46af0ff3d' - 'd7c6bbc24e8464dcfb4fd86cb76fa3a55f4822f5e8196e41a2c39650432aa401' - '8e97cb867f958170fe3613921965ef1c56d282e22c5ba8ff6687ed52b9fabf01' - '987d68c4ca5c5839773df292c76e2e044bc628118b96f1c80fcca55122cea1cb' - '48005c5afda97770db17265285348cc059d414fff58354b690a4827fa755fc73') - -prepare() { - cd "${srcdir}/coreclr-${_coreclrver11}" - patch -p1 < "${srcdir}/llvm-39-github-pull-8311.patch" - patch -p1 < "${srcdir}/llvm-39-move.patch" - patch -p0 < "${srcdir}/lttng-uts-40.patch" - - cd "${srcdir}/coreclr-${_coreclrver10}" - patch -p1 < "${srcdir}/llvm-39-github-pull-8311.patch" - patch -p1 < "${srcdir}/llvm-39-move.patch" - patch -p0 < "${srcdir}/lttng-uts-40.patch" - patch -p1 < "${srcdir}/no-libstdcpp-wrappers-for-stdlib.patch" - patch -p1 < "${srcdir}/fix-dtor-call.patch" - - cd "${srcdir}/corefx-${_corefxver10}" - patch -p1 < "${srcdir}/fix-readdir-on-glibc-2.24.patch" -} - -build() { - cd "${srcdir}/coreclr-${_coreclrver10}" - ./build.sh x64 release - - cd "${srcdir}/coreclr-${_coreclrver11}" - ./build.sh x64 release - - cd "${srcdir}/corefx-${_corefxver10}" - ./build.sh native x64 release - - cd "${srcdir}/corefx-${_corefxver11}" - ./src/Native/build-native.sh x64 release -} - -_coreclr_files=( - 'libclrjit.so' - 'libcoreclr.so' - 'libcoreclrtraceptprovider.so' - 'libdbgshim.so' - 'libmscordaccore.so' - 'libmscordbi.so' - 'libsosplugin.so' - 'libsos.so' - 'System.Globalization.Native.so' -) - -_corefx_files=( - 'System.IO.Compression.Native.so' - 'System.Native.so' - 'System.Net.Http.Native.so' - 'System.Net.Security.Native.so' - 'System.Security.Cryptography.Native*.so' -) - -_copy_file() { - cp --force --preserve=mode $1 "$2/shared/Microsoft.NETCore.App/$3/" -} +sha256sums=('d2d439fd7e544e120db4fb7246ec99cad199ad8d827a78e3e4157f8e331aa066') package() { - local _outdir="${pkgdir}/opt/dotnet" - mkdir -p "${_outdir}" - - tar -C "${_outdir}" -xzf "${srcdir}/${pkgname}-${pkgver}.tar.gz" - - for file in "${_coreclr_files[@]}"; do - _copy_file "${srcdir}/coreclr-${_coreclrver11}/bin/Product/Linux.x64.Release/${file}" "${_outdir}" "${_coreclrver11}" - # last argument is ${corefxver10} on purpose! - _copy_file "${srcdir}/coreclr-${_coreclrver10}/bin/Product/Linux.x64.Release/${file}" "${_outdir}" "${_corefxver10}" - done + mkdir -p "${pkgdir}/opt/dotnet/" - for file in "${_corefx_files[@]}"; do - _copy_file "${srcdir}/corefx-${_corefxver11}/bin/Linux.x64.Release/Native/${file}" "${_outdir}" "${_corefxver11}" - _copy_file "${srcdir}/corefx-${_corefxver10}/bin/Linux.x64.Release/Native/${file}" "${_outdir}" "${_corefxver10}" - done + install -m 755 -o root -g root -D "${srcdir}/host/fxr/1.1.0/libhostfxr.so" "${pkgdir}/opt/dotnet/host/fxr/1.1.0/libhostfxr.so" + install -m 755 -o root -g root -D "${srcdir}/dotnet" "${pkgdir}/opt/dotnet/dotnet" + + install -m 644 -o root -g root -D "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/dotnet/LICENSE" + install -m 644 -o root -g root -D "${srcdir}/ThirdPartyNotices.txt" "${pkgdir}/usr/share/licenses/dotnet/ThirdPartyNotices" mkdir -p "${pkgdir}/usr/bin/" ln -s "/opt/dotnet/dotnet" "${pkgdir}/usr/bin/dotnet" - chown -R 0:0 "${_outdir}" - find "${_outdir}" -name *.dll -exec chmod 644 {} \; - find "${_outdir}" -name *.exe -exec chmod 755 {} \; } # vim:set ts=2 sw=2 et: diff --git a/fix-dtor-call.patch b/fix-dtor-call.patch deleted file mode 100644 index db3d33794d58..000000000000 --- a/fix-dtor-call.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c2ef0939ffa56dca0c923d7f484b69e30de205d2 Mon Sep 17 00:00:00 2001 -From: "John Chen (CLR)" <jochen@microsoft.com> -Date: Wed, 21 Sep 2016 10:58:39 -0700 -Subject: [PATCH] Fix OS X build break with AppleClang 8.0.0 - -Fixes issue #7275 ---- - src/pal/src/include/pal/sharedmemory.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/pal/src/include/pal/sharedmemory.h b/src/pal/src/include/pal/sharedmemory.h -index 475cd70..45cc4b2 100644 ---- a/src/pal/src/include/pal/sharedmemory.h -+++ b/src/pal/src/include/pal/sharedmemory.h -@@ -182,6 +182,10 @@ class SharedMemoryProcessDataBase - virtual void Close(bool isAbruptShutdown, bool releaseSharedData) - { - } -+ -+ virtual ~SharedMemoryProcessDataBase() -+ { -+ } - }; - - class SharedMemoryProcessDataHeader diff --git a/fix-readdir-on-glibc-2.24.patch b/fix-readdir-on-glibc-2.24.patch deleted file mode 100644 index 68a4a2b89951..000000000000 --- a/fix-readdir-on-glibc-2.24.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/src/Native/System.Native/pal_io.cpp b/src/Native/System.Native/pal_io.cpp -index 7da1bff..f2001dc 100644 ---- a/src/Native/System.Native/pal_io.cpp -+++ b/src/Native/System.Native/pal_io.cpp -@@ -321,11 +321,13 @@ extern "C" int32_t SystemNative_GetDirentSize() - // size of the dirent struct. - // 2) The managed code creates a byte[] buffer of the size of the native dirent - // and passes a pointer to this buffer to this function. --// 3) This function passes input byte[] buffer to the OS to fill with dirent data --// which makes the 1st strcpy. --// 4) The ConvertDirent function will set a pointer to the start of the inode name --// in the byte[] buffer so the managed code and find it and copy it out of the --// buffer into a managed string that the caller of the framework can use, making -+// 3) This function passes input byte[] buffer to the OS to fill with dirent -+// data which makes the 1st strcpy. -+// 4) The ConvertDirent function will fill DirectoryEntry outputEntry with -+// pointers from byte[] buffer. -+// 5) The managed code uses DirectoryEntry outputEntry to find start of d_name -+// and the value of d_namelen, if avalable, to copy the name from -+// byte[] buffer into a managed string that the caller can use; this makes - // the 2nd and final strcpy. - extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferSize, DirectoryEntry* outputEntry) - { -@@ -341,6 +343,7 @@ extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferS - - dirent* result = nullptr; - dirent* entry = static_cast<dirent*>(buffer); -+#ifdef HAVE_READDIR_R - int error = readdir_r(dir, entry, &result); - - // positive error number returned -> failure -@@ -360,6 +363,27 @@ extern "C" int32_t SystemNative_ReadDirR(DIR* dir, void* buffer, int32_t bufferS - - // 0 returned with non-null result (guaranteed to be set to entry arg) -> success - assert(result == entry); -+#else -+ errno = 0; -+ result = readdir(dir); -+ -+ // 0 returned with null result -> end-of-stream -+ if (result == nullptr) -+ { -+ *outputEntry = {}; // managed out param must be initialized -+ -+ // kernel set errno -> failure -+ if (errno != 0) -+ { -+ assert(errno == EBADF); // Invalid directory stream descriptor dir. -+ return errno; -+ } -+ return -1; -+ } -+ -+ assert(result->d_reclen <= bufferSize); -+ memcpy(entry, result, static_cast<size_t>(result->d_reclen)); -+#endif - ConvertDirent(*entry, outputEntry); - return 0; - } -diff --git a/src/Native/configure.cmake b/src/Native/configure.cmake -index 017d75f..663aff8 100644 ---- a/src/Native/configure.cmake -+++ b/src/Native/configure.cmake -@@ -174,6 +174,20 @@ check_cxx_source_compiles( - - check_cxx_source_compiles( - " -+ #include <dirent.h> -+ int main(void) -+ { -+ DIR* dir; -+ struct dirent* entry; -+ struct dirent* result; -+ readdir_r(dir, entry, &result); -+ return 0; -+ } -+ " -+ HAVE_READDIR_R) -+ -+check_cxx_source_compiles( -+ " - #include <sys/types.h> - #include <sys/event.h> - int main(void) -@@ -274,12 +288,12 @@ check_cxx_source_runs( - #include <sys/time.h> - int main() - { -- int ret; -+ int ret; - struct timespec ts; - ret = clock_gettime(CLOCK_MONOTONIC, &ts); - exit(ret); - } -- " -+ " - HAVE_CLOCK_MONOTONIC) - - check_function_exists( -@@ -399,9 +413,9 @@ check_function_exists( - - set (HAVE_INOTIFY 0) - if (HAVE_INOTIFY_INIT AND HAVE_INOTIFY_ADD_WATCH AND HAVE_INOTIFY_RM_WATCH) -- set (HAVE_INOTIFY 1) -+ set (HAVE_INOTIFY 1) - elseif (CMAKE_SYSTEM_NAME STREQUAL Linux) -- message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.") -+ message(FATAL_ERROR "Cannot find inotify functions on a Linux platform.") - endif() - - check_cxx_source_compiles( -@@ -428,8 +442,8 @@ check_cxx_source_compiles( - check_cxx_source_compiles( - " - #include <curl/curl.h> -- int main() -- { -+ int main() -+ { - int i = CURL_SSLVERSION_TLSv1_0; - i = CURL_SSLVERSION_TLSv1_1; - i = CURL_SSLVERSION_TLSv1_2; diff --git a/llvm-39-github-pull-8311.patch b/llvm-39-github-pull-8311.patch deleted file mode 100644 index 21b8374050a3..000000000000 --- a/llvm-39-github-pull-8311.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 9f4bf341ad236df7d16bbdba0c4111393ea141d2 Mon Sep 17 00:00:00 2001 -From: Jan Vorlicek <janvorli@microsoft.com> -Date: Sun, 27 Nov 2016 05:34:03 +0100 -Subject: [PATCH] Fix building CoreCLR with Clang 3.9 (#8311) - -There were few constructs that Clang 3.9 didn't like due to its strict -C++ standard conformance rules. ---- - src/debug/daccess/dacdbiimpl.cpp | 2 +- - src/debug/di/rsmain.cpp | 2 ++ - src/debug/di/rspriv.h | 2 +- - src/debug/ee/debugger.cpp | 3 +++ - src/debug/ee/debugger.h | 4 ++-- - src/debug/ildbsymlib/symwrite.h | 3 ++- - src/debug/inc/dacdbiinterface.h | 2 +- - src/pal/src/exception/seh.cpp | 2 +- - tests/src/Common/Platform/platformdefines.cpp | 2 +- - tests/src/Common/Platform/platformdefines.h | 2 +- - tests/src/Interop/common/types.h | 4 ++-- - 11 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp -index 26e3d6c..ae266e8 100644 ---- a/src/debug/daccess/dacdbiimpl.cpp -+++ b/src/debug/daccess/dacdbiimpl.cpp -@@ -90,7 +90,7 @@ IDacDbiInterface::IAllocator * g_pAllocator = NULL; - // - - // Need a class to serve as a tag that we can use to overload New/Delete. --#define forDbi (*(forDbiWorker *)NULL) -+forDbiWorker forDbi; - - void * operator new(size_t lenBytes, const forDbiWorker &) - { -diff --git a/src/debug/di/rsmain.cpp b/src/debug/di/rsmain.cpp -index b568575..0f57787 100644 ---- a/src/debug/di/rsmain.cpp -+++ b/src/debug/di/rsmain.cpp -@@ -40,6 +40,8 @@ - RSDebuggingInfo g_RSDebuggingInfo_OutOfProc = {0 }; // set to NULL - RSDebuggingInfo * g_pRSDebuggingInfo = &g_RSDebuggingInfo_OutOfProc; - -+// The following instances are used for invoking overloaded new/delete -+forDbiWorker forDbi; - - #ifdef _DEBUG - // For logs, we can print the string name for the debug codes. -diff --git a/src/debug/di/rspriv.h b/src/debug/di/rspriv.h -index bc0ea59..18920ad 100644 ---- a/src/debug/di/rspriv.h -+++ b/src/debug/di/rspriv.h -@@ -177,7 +177,7 @@ private: - USHORT m_usPort; - }; - --#define forDbi (*(forDbiWorker *)NULL) -+extern forDbiWorker forDbi; - - // for dbi we just default to new, but we need to have these defined for both dac and dbi - inline void * operator new(size_t lenBytes, const forDbiWorker &) -diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp -index a06811c..d67cb41 100644 ---- a/src/debug/ee/debugger.cpp -+++ b/src/debug/ee/debugger.cpp -@@ -75,6 +75,9 @@ SVAL_IMPL_INIT(BOOL, Debugger, s_fCanChangeNgenFlags, TRUE); - - bool g_EnableSIS = false; - -+// The following instances are used for invoking overloaded new/delete -+InteropSafe interopsafe; -+InteropSafeExecutable interopsafeEXEC; - - #ifndef DACCESS_COMPILE - -diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h -index 6368647..9cdf546 100644 ---- a/src/debug/ee/debugger.h -+++ b/src/debug/ee/debugger.h -@@ -3512,10 +3512,10 @@ public: - * ------------------------------------------------------------------------ */ - - class InteropSafe {}; --#define interopsafe (*(InteropSafe*)NULL) -+extern InteropSafe interopsafe; - - class InteropSafeExecutable {}; --#define interopsafeEXEC (*(InteropSafeExecutable*)NULL) -+extern InteropSafeExecutable interopsafeEXEC; - - #ifndef DACCESS_COMPILE - inline void * __cdecl operator new(size_t n, const InteropSafe&) -diff --git a/src/debug/ildbsymlib/symwrite.h b/src/debug/ildbsymlib/symwrite.h -index 055b8ec..54ab11a 100644 ---- a/src/debug/ildbsymlib/symwrite.h -+++ b/src/debug/ildbsymlib/symwrite.h -@@ -839,7 +839,8 @@ public: - { - // Help mitigate the impact of buffer overflow - // Fail fast with a null-reference AV -- return *(static_cast<T*>(0)) ; -+ volatile char* nullPointer = nullptr; -+ *nullPointer; - } - return m_array[ i ]; - } -diff --git a/src/debug/inc/dacdbiinterface.h b/src/debug/inc/dacdbiinterface.h -index e61e240..569ccba 100644 ---- a/src/debug/inc/dacdbiinterface.h -+++ b/src/debug/inc/dacdbiinterface.h -@@ -32,7 +32,7 @@ - template<class T> void DeleteDbiMemory(T *p); - // Need a class to serve as a tag that we can use to overload New/Delete. - class forDbiWorker {}; --#define forDbi (*(forDbiWorker *)NULL) -+extern forDbiWorker forDbi; - extern void * operator new(size_t lenBytes, const forDbiWorker &); - extern void * operator new[](size_t lenBytes, const forDbiWorker &); - extern void operator delete(void *p, const forDbiWorker &); -diff --git a/src/pal/src/exception/seh.cpp b/src/pal/src/exception/seh.cpp -index 473c490..ad09e02 100644 ---- a/src/pal/src/exception/seh.cpp -+++ b/src/pal/src/exception/seh.cpp -@@ -274,7 +274,7 @@ SEHProcessException(PAL_SEHException* exception) - { - // The exception happened in the page right below the stack limit, - // so it is a stack overflow -- write(STDERR_FILENO, StackOverflowMessage, sizeof(StackOverflowMessage) - 1); -+ (void)write(STDERR_FILENO, StackOverflowMessage, sizeof(StackOverflowMessage) - 1); - PROCAbort(); - } - } -diff --git a/tests/src/Common/Platform/platformdefines.cpp b/tests/src/Common/Platform/platformdefines.cpp -index 4bef170..82061ac 100644 ---- a/tests/src/Common/Platform/platformdefines.cpp -+++ b/tests/src/Common/Platform/platformdefines.cpp -@@ -277,7 +277,7 @@ DWORD TP_GetFullPathName(LPWSTR fileName, DWORD nBufferLength, LPWSTR lpBuffer) - return GetFullPathNameW(fileName, nBufferLength, lpBuffer, NULL); - #else - char nativeFullPath[MAX_PATH]; -- realpath(HackyConvertToSTR(fileName), nativeFullPath); -+ (void)realpath(HackyConvertToSTR(fileName), nativeFullPath); - LPWSTR fullPathForCLR = HackyConvertToWSTR(nativeFullPath); - wcscpy_s(lpBuffer, MAX_PATH, fullPathForCLR); - return wcslen(lpBuffer); -diff --git a/tests/src/Common/Platform/platformdefines.h b/tests/src/Common/Platform/platformdefines.h -index 49e8f88..c196b0c 100644 ---- a/tests/src/Common/Platform/platformdefines.h -+++ b/tests/src/Common/Platform/platformdefines.h -@@ -87,7 +87,7 @@ typedef void* HMODULE; - typedef void* ULONG_PTR; - typedef unsigned error_t; - typedef void* LPVOID; --typedef char BYTE; -+typedef unsigned char BYTE; - typedef WCHAR OLECHAR; - #endif - -diff --git a/tests/src/Interop/common/types.h b/tests/src/Interop/common/types.h -index 7d7f776..cb59c42 100755 ---- a/tests/src/Interop/common/types.h -+++ b/tests/src/Interop/common/types.h -@@ -28,7 +28,7 @@ typedef void* HMODULE; - typedef void* ULONG_PTR; - typedef unsigned error_t; - typedef void* LPVOID; --typedef char BYTE; -+typedef unsigned char BYTE; - typedef WCHAR OLECHAR; - - typedef unsigned int UINT_PTR; -@@ -54,4 +54,4 @@ typedef int* DWORD_PTR; - #define FALSE 0 - #endif - --#endif //_INTEROP_TYPES__H -\ No newline at end of file -+#endif //_INTEROP_TYPES__H --- -2.10.2 - diff --git a/llvm-39-move.patch b/llvm-39-move.patch deleted file mode 100644 index 2c02d41c3f28..000000000000 --- a/llvm-39-move.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7dfb2ed8614dea8c2fe757592436a38694e91ebc Mon Sep 17 00:00:00 2001 -From: Jan Vorlicek <janvorli@microsoft.com> -Date: Fri, 28 Oct 2016 04:34:42 +0200 -Subject: [PATCH] Add missing std::move to one exception throw (#7865) - -We had the std::move missing in one of the exception throws. For some reason, -the current clang didn't complain about it even though the copy constructor was -deleted. ---- - src/vm/exceptionhandling.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp -index e59f10e..ed155eb 100644 ---- a/src/vm/exceptionhandling.cpp -+++ b/src/vm/exceptionhandling.cpp -@@ -4730,7 +4730,7 @@ VOID DECLSPEC_NORETURN DispatchManagedException(PAL_SEHException& ex, bool isHar - } - } - -- throw ex; -+ throw std::move(ex); - } - - #ifdef _AMD64_ --- -2.10.2 - diff --git a/lttng-uts-40.patch b/lttng-uts-40.patch deleted file mode 100644 index 6534d0d5339e..000000000000 --- a/lttng-uts-40.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur src/pal/src/configure.cmake-orig src/pal/src/configure.cmake
---- src/pal/src/configure.cmake-orig 2016-12-27 09:27:00.480715728 -0500
-+++ src/pal/src/configure.cmake 2016-12-27 09:26:28.707299084 -0500
-@@ -13,7 +13,7 @@
- set(CMAKE_REQUIRED_INCLUDES /opt/local/include)
- endif()
- if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-- set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
-+ set(CMAKE_REQUIRED_DEFINITIONS "-D_BSD_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
- endif()
-
- list(APPEND CMAKE_REQUIRED_DEFINITIONS -D_FILE_OFFSET_BITS=64)
-@@ -33,7 +33,15 @@
- check_include_files(lwp.h HAVE_LWP_H)
- check_include_files(libunwind.h HAVE_LIBUNWIND_H)
- check_include_files(runetype.h HAVE_RUNETYPE_H)
-+
-+if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+ set(CMAKE_REQUIRED_FLAGS "-ldl")
-+endif()
- check_include_files(lttng/tracepoint.h HAVE_LTTNG_TRACEPOINT_H)
-+if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+ unset(CMAKE_REQUIRED_FLAGS)
-+endif()
-+
- check_include_files(uuid/uuid.h HAVE_LIBUUID_H)
- check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H)
- check_include_files(gnu/lib-names.h HAVE_GNU_LIBNAMES_H)
-@@ -62,7 +70,6 @@
- check_function_exists(localtime_r HAVE_LOCALTIME_R)
- check_function_exists(gmtime_r HAVE_GMTIME_R)
- check_function_exists(timegm HAVE_TIMEGM)
--check_function_exists(_snwprintf HAVE__SNWPRINTF)
- check_function_exists(poll HAVE_POLL)
- check_function_exists(statvfs HAVE_STATVFS)
- check_function_exists(thread_self HAVE_THREAD_SELF)
\ No newline at end of file diff --git a/no-libstdcpp-wrappers-for-stdlib.patch b/no-libstdcpp-wrappers-for-stdlib.patch deleted file mode 100644 index d6859a309ddb..000000000000 --- a/no-libstdcpp-wrappers-for-stdlib.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7864b05cfcf16b1261962c5538e2f071759a1d9e Mon Sep 17 00:00:00 2001 -From: Juergen Hoetzel <juergen@archlinux.org> -Date: Fri, 27 May 2016 18:13:17 +0200 -Subject: [PATCH] Don't use libstdc++ wrappers for stdlib.h - -This prevents #undef of min/max macros. Refs #5006. ---- - src/pal/src/include/pal/palinternal.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h -index 4c01be8..fdebc8d 100644 ---- a/src/pal/src/include/pal/palinternal.h -+++ b/src/pal/src/include/pal/palinternal.h -@@ -567,6 +567,10 @@ function_name() to call the system's implementation - #endif - #include <ctype.h> - -+// Don't use C++ wrappers for stdlib.h -+// https://gcc.gnu.org/ml/libstdc++/2016-01/msg00025.html -+#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS 1 -+ - #define _WITH_GETLINE - #include <stdio.h> - #include <stdlib.h> |