From 6ba0da23aff3e77ac7df70423a7c4daf6dd838e1 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Jan 22 2021 16:20:45 +0000 Subject: Update to .NET Core SDK 2.1.520 and Runtime 2.1.24 --- diff --git a/build-coreclr-werror.patch b/build-coreclr-werror.patch new file mode 100644 index 0000000..bc2ccdf --- /dev/null +++ b/build-coreclr-werror.patch @@ -0,0 +1,15 @@ +diff -ru a/compileoptions.cmake b/compileoptions.cmake +--- a/compileoptions.cmake ++++ b/compileoptions.cmake +@@ -23,11 +23,6 @@ + # after hitting just about 20 errors. + add_compile_options(-ferror-limit=4096) + +- if (CLR_CMAKE_WARNINGS_ARE_ERRORS) +- # All warnings that are not explicitly disabled are reported as errors +- add_compile_options(-Werror) +- endif(CLR_CMAKE_WARNINGS_ARE_ERRORS) +- + # Disabled warnings + add_compile_options(-Wno-unused-private-field) + add_compile_options(-Wno-unused-variable) diff --git a/build-corefx-werror.patch b/build-corefx-werror.patch new file mode 100644 index 0000000..aadb6c7 --- /dev/null +++ b/build-corefx-werror.patch @@ -0,0 +1,12 @@ +diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt +index 7d804a1e54..717c2718d7 100644 +--- a/src/Native/Unix/CMakeLists.txt ++++ b/src/Native/Unix/CMakeLists.txt +@@ -25,7 +25,6 @@ add_compile_options(-fPIC) + add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) + add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) + add_compile_options(-g) +-add_compile_options(-Werror) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) + add_compile_options(-Wno-unreachable-code) + endif () diff --git a/build-dotnet-tarball b/build-dotnet-tarball index 1e22fd6..9c4ff05 100755 --- a/build-dotnet-tarball +++ b/build-dotnet-tarball @@ -65,6 +65,10 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then pushd source-build git checkout "${tag}" git submodule update --init --recursive + mkdir -p patches/coreclr + cp ../../build-coreclr-werror.patch patches/coreclr/ + mkdir -p patches/corefx + cp ../../build-corefx-werror.patch patches/corefx/ clean_dotnet_cache ./build-source-tarball.sh "${unmodified_tarball_name}" popd diff --git a/copr-build b/copr-build index d728d04..1be7465 100755 --- a/copr-build +++ b/copr-build @@ -4,7 +4,7 @@ set -euo pipefail set -x -fedpkg --release f29 srpm 2>&1 | tee fedpkg.output +fedpkg --release f32 srpm 2>&1 | tee fedpkg.output srpm_name=$(grep 'Wrote: ' fedpkg.output | cut -d' ' -f 2) diff --git a/coreclr-28045-clang10.patch b/coreclr-28045-clang10.patch deleted file mode 100644 index 2726bc4..0000000 --- a/coreclr-28045-clang10.patch +++ /dev/null @@ -1,455 +0,0 @@ -From e73f34074a381891ee92711e496134dce758a969 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Tue, 2 Jun 2020 12:16:31 -0400 -Subject: [PATCH] Fix build with clang 10 - -This contains a grab bag of fixes to fix the build with clang 10. - -- https://github.com/dotnet/coreclr/pull/23075 - - Fix missing includes in coreclr/src/debug/createdump/ - -- https://github.com/dotnet/runtime/pull/33096 - - SList::Init: add missing constructor - -- A subset of https://github.com/dotnet/coreclr/pull/22129 - - Just the parts that introduce the THROW_DECL macro in pal.h - -- https://github.com/dotnet/runtime/pull/32837 - - This fixes THROW_DECL introduce in the previous PR to work with clang, which - is required in clang 10. - -- One new change: - - In a significant divergance, this commits adds more THROW_DECL macros - to all the math functions to address a ton of errors pointed out when - building SOS: - - In file included from /home/omajid/devel/dotnet/coreclr/src/ToolBox/SOS/Strike/strike.cpp:116: - In file included from /home/omajid/devel/dotnet/coreclr/src/vm/hillclimbing.h:19: - In file included from /home/omajid/devel/dotnet/coreclr/src/inc/complex.h:16: - In file included from /usr/bin/../lib/gcc/x86_64-redhat-linux/10/../../../../include/c++/10/math.h:36: - In file included from /usr/bin/../lib/gcc/x86_64-redhat-linux/10/../../../../include/c++/10/cmath:45: - In file included from /usr/include/math.h:290: - /usr/include/bits/mathcalls.h:53:13: error: exception specification in declaration does not match previous declaration - __MATHCALL (acos,, (_Mdouble_ __x)); - ^ - /home/omajid/devel/dotnet/coreclr/src/pal/inc/pal.h:4395:26: note: previous declaration is here - PALIMPORT double __cdecl acos(double); - ^ - - Then, to make sure the declarations and implementations match, it adds - THROW_DECL to the definitions in src/pal/src/cruntime/math.cpp - -Co-authored-by: Mike McLaughlin -Co-authored-by: Sinan Kaya -Co-authored-by: Tom Deseyn ---- - src/debug/createdump/createdump.h | 2 + - src/inc/slist.h | 6 +- - src/pal/inc/mbusafecrt.h | 8 ++- - src/pal/inc/pal.h | 107 ++++++++++++++++-------------- - src/pal/src/cruntime/math.cpp | 36 +++++----- - src/pal/src/safecrt/memcpy_s.cpp | 2 +- - 6 files changed, 87 insertions(+), 74 deletions(-) - -diff --git a/src/debug/createdump/createdump.h b/src/debug/createdump/createdump.h -index 4892e5464b1f..3f71b627e642 100644 ---- a/src/debug/createdump/createdump.h -+++ b/src/debug/createdump/createdump.h -@@ -54,6 +54,8 @@ typedef int T_CONTEXT; - #include - #include - #include -+#include -+#include - #include "datatarget.h" - #include "threadinfo.h" - #include "memoryregion.h" -diff --git a/src/inc/slist.h b/src/inc/slist.h -index 2b81f9ba902b..8ea6f9098e2e 100644 ---- a/src/inc/slist.h -+++ b/src/inc/slist.h -@@ -160,13 +160,13 @@ class SList - void Init() - { - LIMITED_METHOD_CONTRACT; -- m_pHead = &m_link; -+ m_pHead = PTR_SLink(&m_link); - // NOTE :: fHead variable is template argument - // the following code is a compiled in, only if the fHead flag - // is set to false, - if (!fHead) - { -- m_pTail = &m_link; -+ m_pTail = PTR_SLink(&m_link); - } - } - -@@ -274,7 +274,7 @@ class SList - SLink *ret = SLink::FindAndRemove(m_pHead, GetLink(pObj), &prior); - - if (ret == m_pTail) -- m_pTail = prior; -+ m_pTail = PTR_SLink(prior); - - return GetObject(ret); - } -diff --git a/src/pal/inc/mbusafecrt.h b/src/pal/inc/mbusafecrt.h -index f030b7ded20c..7021439af2d1 100644 ---- a/src/pal/inc/mbusafecrt.h -+++ b/src/pal/inc/mbusafecrt.h -@@ -31,6 +31,12 @@ typedef int errno_t; - // define the return value for success - #define SAFECRT_SUCCESS 0 - -+#if defined(_MSC_VER) -+#define THROW_DECL -+#else -+#define THROW_DECL throw() -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -98,7 +104,7 @@ extern int swscanf_s( const WCHAR *string, const WCHAR *format, ... ); - extern int _snscanf_s( const char *string, size_t count, const char *format, ... ); - extern int _snwscanf_s( const WCHAR *string, size_t count, const WCHAR *format, ... ); - --extern errno_t memcpy_s( void * dst, size_t sizeInBytes, const void * src, size_t count ); -+extern errno_t memcpy_s( void * dst, size_t sizeInBytes, const void * src, size_t count ) THROW_DECL; - extern errno_t memmove_s( void * dst, size_t sizeInBytes, const void * src, size_t count ); - - #ifdef __cplusplus -diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h -index 5106c0142118..de20524faf12 100644 ---- a/src/pal/inc/pal.h -+++ b/src/pal/inc/pal.h -@@ -137,6 +137,11 @@ extern "C" { - #define LANG_THAI 0x1e - - /******************* Compiler-specific glue *******************************/ -+#if defined(_MSC_VER) || !defined(__cplusplus) -+#define THROW_DECL -+#else -+#define THROW_DECL throw() -+#endif - - #ifndef _MSC_VER - #if defined(CORECLR) -@@ -4207,7 +4212,7 @@ EXTERN_C - PALIMPORT - void *PAL_memcpy (void *dest, const void *src, size_t count); - --PALIMPORT void * __cdecl memcpy(void *, const void *, size_t); -+PALIMPORT void * __cdecl memcpy(void *, const void *, size_t) THROW_DECL; - - #define memcpy PAL_memcpy - #define IS_PAL_memcpy 1 -@@ -4220,7 +4225,7 @@ PALIMPORT int __cdecl memcmp(const void *, const void *, size_t); - PALIMPORT void * __cdecl memset(void *, int, size_t); - PALIMPORT void * __cdecl memmove(void *, const void *, size_t); - PALIMPORT void * __cdecl memchr(const void *, int, size_t); --PALIMPORT long long int __cdecl atoll(const char *); -+PALIMPORT long long int __cdecl atoll(const char *) THROW_DECL; - PALIMPORT size_t __cdecl strlen(const char *); - PALIMPORT int __cdecl strcmp(const char*, const char *); - PALIMPORT int __cdecl strncmp(const char*, const char *, size_t); -@@ -4259,7 +4264,7 @@ PALIMPORT int __cdecl toupper(int); - #define _TRUNCATE ((size_t)-1) - #endif - --PALIMPORT errno_t __cdecl memcpy_s(void *, size_t, const void *, size_t); -+PALIMPORT errno_t __cdecl memcpy_s(void *, size_t, const void *, size_t) THROW_DECL; - PALIMPORT errno_t __cdecl memmove_s(void *, size_t, const void *, size_t); - PALIMPORT char * __cdecl _strlwr(char *); - PALIMPORT int __cdecl _stricmp(const char *, const char *); -@@ -4387,58 +4392,58 @@ PALIMPORT long long __cdecl llabs(long long); - PALIMPORT int __cdecl _finite(double); - PALIMPORT int __cdecl _isnan(double); - PALIMPORT double __cdecl _copysign(double, double); --PALIMPORT double __cdecl acos(double); --PALIMPORT double __cdecl acosh(double); --PALIMPORT double __cdecl asin(double); --PALIMPORT double __cdecl asinh(double); --PALIMPORT double __cdecl atan(double); --PALIMPORT double __cdecl atanh(double); --PALIMPORT double __cdecl atan2(double, double); --PALIMPORT double __cdecl cbrt(double); --PALIMPORT double __cdecl ceil(double); --PALIMPORT double __cdecl cos(double); --PALIMPORT double __cdecl cosh(double); --PALIMPORT double __cdecl exp(double); --PALIMPORT double __cdecl fabs(double); --PALIMPORT double __cdecl floor(double); --PALIMPORT double __cdecl fmod(double, double); --PALIMPORT double __cdecl log(double); --PALIMPORT double __cdecl log10(double); --PALIMPORT double __cdecl modf(double, double*); --PALIMPORT double __cdecl pow(double, double); --PALIMPORT double __cdecl sin(double); --PALIMPORT double __cdecl sinh(double); --PALIMPORT double __cdecl sqrt(double); --PALIMPORT double __cdecl tan(double); --PALIMPORT double __cdecl tanh(double); -+PALIMPORT double __cdecl acos(double) THROW_DECL; -+PALIMPORT double __cdecl acosh(double) THROW_DECL; -+PALIMPORT double __cdecl asin(double) THROW_DECL; -+PALIMPORT double __cdecl asinh(double) THROW_DECL; -+PALIMPORT double __cdecl atan(double) THROW_DECL; -+PALIMPORT double __cdecl atanh(double) THROW_DECL; -+PALIMPORT double __cdecl atan2(double, double) THROW_DECL; -+PALIMPORT double __cdecl cbrt(double) THROW_DECL; -+PALIMPORT double __cdecl ceil(double) THROW_DECL; -+PALIMPORT double __cdecl cos(double) THROW_DECL; -+PALIMPORT double __cdecl cosh(double) THROW_DECL; -+PALIMPORT double __cdecl exp(double) THROW_DECL; -+PALIMPORT double __cdecl fabs(double) THROW_DECL; -+PALIMPORT double __cdecl floor(double) THROW_DECL; -+PALIMPORT double __cdecl fmod(double, double) THROW_DECL; -+PALIMPORT double __cdecl log(double) THROW_DECL; -+PALIMPORT double __cdecl log10(double) THROW_DECL; -+PALIMPORT double __cdecl modf(double, double*) THROW_DECL; -+PALIMPORT double __cdecl pow(double, double) THROW_DECL; -+PALIMPORT double __cdecl sin(double) THROW_DECL; -+PALIMPORT double __cdecl sinh(double) THROW_DECL; -+PALIMPORT double __cdecl sqrt(double) THROW_DECL; -+PALIMPORT double __cdecl tan(double) THROW_DECL; -+PALIMPORT double __cdecl tanh(double) THROW_DECL; - - PALIMPORT int __cdecl _finitef(float); - PALIMPORT int __cdecl _isnanf(float); - PALIMPORT float __cdecl _copysignf(float, float); --PALIMPORT float __cdecl acosf(float); --PALIMPORT float __cdecl acoshf(float); --PALIMPORT float __cdecl asinf(float); --PALIMPORT float __cdecl asinhf(float); --PALIMPORT float __cdecl atanf(float); --PALIMPORT float __cdecl atanhf(float); --PALIMPORT float __cdecl atan2f(float, float); --PALIMPORT float __cdecl cbrtf(float); --PALIMPORT float __cdecl ceilf(float); --PALIMPORT float __cdecl cosf(float); --PALIMPORT float __cdecl coshf(float); --PALIMPORT float __cdecl expf(float); --PALIMPORT float __cdecl fabsf(float); --PALIMPORT float __cdecl floorf(float); --PALIMPORT float __cdecl fmodf(float, float); --PALIMPORT float __cdecl logf(float); --PALIMPORT float __cdecl log10f(float); --PALIMPORT float __cdecl modff(float, float*); --PALIMPORT float __cdecl powf(float, float); --PALIMPORT float __cdecl sinf(float); --PALIMPORT float __cdecl sinhf(float); --PALIMPORT float __cdecl sqrtf(float); --PALIMPORT float __cdecl tanf(float); --PALIMPORT float __cdecl tanhf(float); -+PALIMPORT float __cdecl acosf(float) THROW_DECL; -+PALIMPORT float __cdecl acoshf(float) THROW_DECL; -+PALIMPORT float __cdecl asinf(float) THROW_DECL; -+PALIMPORT float __cdecl asinhf(float) THROW_DECL; -+PALIMPORT float __cdecl atanf(float) THROW_DECL; -+PALIMPORT float __cdecl atanhf(float) THROW_DECL; -+PALIMPORT float __cdecl atan2f(float, float) THROW_DECL; -+PALIMPORT float __cdecl cbrtf(float) THROW_DECL; -+PALIMPORT float __cdecl ceilf(float) THROW_DECL; -+PALIMPORT float __cdecl cosf(float) THROW_DECL; -+PALIMPORT float __cdecl coshf(float) THROW_DECL; -+PALIMPORT float __cdecl expf(float) THROW_DECL; -+PALIMPORT float __cdecl fabsf(float) THROW_DECL; -+PALIMPORT float __cdecl floorf(float) THROW_DECL; -+PALIMPORT float __cdecl fmodf(float, float) THROW_DECL; -+PALIMPORT float __cdecl logf(float) THROW_DECL; -+PALIMPORT float __cdecl log10f(float) THROW_DECL; -+PALIMPORT float __cdecl modff(float, float*) THROW_DECL; -+PALIMPORT float __cdecl powf(float, float) THROW_DECL; -+PALIMPORT float __cdecl sinf(float) THROW_DECL; -+PALIMPORT float __cdecl sinhf(float) THROW_DECL; -+PALIMPORT float __cdecl sqrtf(float) THROW_DECL; -+PALIMPORT float __cdecl tanf(float) THROW_DECL; -+PALIMPORT float __cdecl tanhf(float) THROW_DECL; - - #ifndef PAL_STDCPP_COMPAT - -diff --git a/src/pal/src/cruntime/math.cpp b/src/pal/src/cruntime/math.cpp -index a36ac9aa9333..81345ea14bbb 100644 ---- a/src/pal/src/cruntime/math.cpp -+++ b/src/pal/src/cruntime/math.cpp -@@ -117,7 +117,7 @@ double __cdecl _copysign(double x, double y) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_acos(double x) -+PALIMPORT double __cdecl PAL_acos(double x) THROW_DECL - { - double ret; - PERF_ENTRY(acos); -@@ -147,7 +147,7 @@ PALIMPORT double __cdecl PAL_acos(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_acosh(double x) -+PALIMPORT double __cdecl PAL_acosh(double x) THROW_DECL - { - double ret; - PERF_ENTRY(acosh); -@@ -166,7 +166,7 @@ PALIMPORT double __cdecl PAL_acosh(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_asin(double x) -+PALIMPORT double __cdecl PAL_asin(double x) THROW_DECL - { - double ret; - PERF_ENTRY(asin); -@@ -196,7 +196,7 @@ PALIMPORT double __cdecl PAL_asin(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_asinh(double x) -+PALIMPORT double __cdecl PAL_asinh(double x) THROW_DECL - { - double ret; - PERF_ENTRY(asinh); -@@ -215,7 +215,7 @@ PALIMPORT double __cdecl PAL_asinh(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_atan2(double y, double x) -+PALIMPORT double __cdecl PAL_atan2(double y, double x) THROW_DECL - { - double ret; - PERF_ENTRY(atan2); -@@ -255,7 +255,7 @@ PALIMPORT double __cdecl PAL_atan2(double y, double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_exp(double x) -+PALIMPORT double __cdecl PAL_exp(double x) THROW_DECL - { - double ret; - PERF_ENTRY(exp); -@@ -306,7 +306,7 @@ PALIMPORT LONG __cdecl PAL_labs(LONG l) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_log(double x) -+PALIMPORT double __cdecl PAL_log(double x) THROW_DECL - { - double ret; - PERF_ENTRY(log); -@@ -336,7 +336,7 @@ PALIMPORT double __cdecl PAL_log(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_log10(double x) -+PALIMPORT double __cdecl PAL_log10(double x) THROW_DECL - { - double ret; - PERF_ENTRY(log10); -@@ -366,7 +366,7 @@ PALIMPORT double __cdecl PAL_log10(double x) - - See MSDN. - --*/ --PALIMPORT double __cdecl PAL_pow(double x, double y) -+PALIMPORT double __cdecl PAL_pow(double x, double y) THROW_DECL - { - double ret; - PERF_ENTRY(pow); -@@ -527,7 +527,7 @@ float __cdecl _copysignf(float x, float y) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_acosf(float x) -+PALIMPORT float __cdecl PAL_acosf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(acosf); -@@ -557,7 +557,7 @@ PALIMPORT float __cdecl PAL_acosf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_acoshf(float x) -+PALIMPORT float __cdecl PAL_acoshf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(acoshf); -@@ -576,7 +576,7 @@ PALIMPORT float __cdecl PAL_acoshf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_asinf(float x) -+PALIMPORT float __cdecl PAL_asinf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(asinf); -@@ -606,7 +606,7 @@ PALIMPORT float __cdecl PAL_asinf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_asinhf(float x) -+PALIMPORT float __cdecl PAL_asinhf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(asinhf); -@@ -626,7 +626,7 @@ PALIMPORT float __cdecl PAL_asinhf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_atan2f(float y, float x) -+PALIMPORT float __cdecl PAL_atan2f(float y, float x) THROW_DECL - { - float ret; - PERF_ENTRY(atan2f); -@@ -666,7 +666,7 @@ PALIMPORT float __cdecl PAL_atan2f(float y, float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_expf(float x) -+PALIMPORT float __cdecl PAL_expf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(expf); -@@ -698,7 +698,7 @@ PALIMPORT float __cdecl PAL_expf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_logf(float x) -+PALIMPORT float __cdecl PAL_logf(float x) THROW_DECL - { - float ret; - PERF_ENTRY(logf); -@@ -728,7 +728,7 @@ PALIMPORT float __cdecl PAL_logf(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_log10f(float x) -+PALIMPORT float __cdecl PAL_log10f(float x) THROW_DECL - { - float ret; - PERF_ENTRY(log10f); -@@ -758,7 +758,7 @@ PALIMPORT float __cdecl PAL_log10f(float x) - - See MSDN. - --*/ --PALIMPORT float __cdecl PAL_powf(float x, float y) -+PALIMPORT float __cdecl PAL_powf(float x, float y) THROW_DECL - { - float ret; - PERF_ENTRY(powf); -diff --git a/src/pal/src/safecrt/memcpy_s.cpp b/src/pal/src/safecrt/memcpy_s.cpp -index 27aeb7966593..a75ec4186140 100644 ---- a/src/pal/src/safecrt/memcpy_s.cpp -+++ b/src/pal/src/safecrt/memcpy_s.cpp -@@ -54,7 +54,7 @@ errno_t __cdecl memcpy_s( - size_t sizeInBytes, - const void * src, - size_t count --) -+) THROW_DECL - { - if (count == 0) - { diff --git a/coreclr-build-python3.patch b/coreclr-build-python3.patch deleted file mode 100644 index 1090a12..0000000 --- a/coreclr-build-python3.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7e0608fee5cacbf5bf7d0c3886e2fcb1a9d10754 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Wed, 9 Jan 2019 12:28:48 -0500 -Subject: [PATCH] Support building with python3 on unix (#19356) - -The windows build scripts try finding python in order of python3, -python2 and then python. The unix build scripts dont. They just try -python2 variants and then fail. This change makes brings them closer -together by letting users build using only python3. ---- - build.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/build.sh b/build.sh -index a0b1742effb..14452ad5ac5 100755 ---- a/build.sh -+++ b/build.sh -@@ -7,9 +7,9 @@ export ghprbCommentBody= - - # resolve python-version to use - if [ "$PYTHON" == "" ] ; then -- if ! PYTHON=$(command -v python2.7 || command -v python2 || command -v python) -+ if ! PYTHON=$(command -v python3 || command -v python2 || command -v python) - then -- echo "Unable to locate build-dependency python2.x!" 1>&2 -+ echo "Unable to locate build-dependency python!" 1>&2 - exit 1 - fi - fi -@@ -17,7 +17,7 @@ fi - # useful in case of explicitly set option. - if ! command -v $PYTHON > /dev/null - then -- echo "Unable to locate build-dependency python2.x ($PYTHON)!" 1>&2 -+ echo "Unable to locate build-dependency python ($PYTHON)!" 1>&2 - exit 1 - fi - diff --git a/coreclr-cmake-python3.patch b/coreclr-cmake-python3.patch deleted file mode 100644 index 285cdc4..0000000 --- a/coreclr-cmake-python3.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e7c6f87f54be723724a4c996d815d59b515b01a6 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Thu, 31 Jan 2019 16:09:35 -0500 -Subject: [PATCH] Update python lookup in CMakeLists.txt to match - build.(sh|cmd) (#22145) - -Use the same logic that's used in build.sh/build.cmd to lookup python: -first search for `python3`, then fall back to `python2` and finally to -`python`. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 82c19a9cbaa..31b814f118d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,7 +37,7 @@ OPTION(CLR_CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF) - OPTION(CLR_CMAKE_WARNINGS_ARE_ERRORS "Warnings are errors" ON) - - # Ensure that python is present --find_program(PYTHON NAMES python2.7 python2 python) -+find_program(PYTHON NAMES python3 python2 python) - if (PYTHON STREQUAL "PYTHON-NOTFOUND") - message(FATAL_ERROR "PYTHON not found: Please install Python 2.7.9 or later from https://www.python.org/downloads/") - endif() diff --git a/coreclr-mscorlib.patch b/coreclr-mscorlib.patch deleted file mode 100644 index ca59e77..0000000 --- a/coreclr-mscorlib.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5164e76ce01fc36833a7f5e6fb7b1ec2f55c2262 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Wed, 1 Aug 2018 12:02:53 -0400 -Subject: [PATCH] Use the identified python when building - System.Private.CoreLib (#19043) - -build.sh and build.cmd contain logic to identify a working version of -python to use. System.Private.CoreLib ignores that and directly invokes -'python', which may not work, or even execute a different program. ---- - build.sh | 2 ++ - src/System.Private.CoreLib/System.Private.CoreLib.csproj | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build.sh b/build.sh -index 091d6227caf..4002f2744c2 100755 ---- a/build.sh -+++ b/build.sh -@@ -22,6 +22,8 @@ then - exit 1 - fi - -+export PYTHON -+ - usage() - { - echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipmscorlib] [-skiptests] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]" -diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj -index 9a2fc681703..0a02d3cffdf 100644 ---- a/src/mscorlib/System.Private.CoreLib.csproj -+++ b/src/mscorlib/System.Private.CoreLib.csproj -@@ -543,7 +543,7 @@ - - $(IntermediateOutputPath)..\cmake.definitions - -- -+ - - - true diff --git a/corefx-optflags-support.patch b/corefx-optflags-support.patch index a445618..8ab8409 100644 --- a/corefx-optflags-support.patch +++ b/corefx-optflags-support.patch @@ -1,15 +1,3 @@ -diff --git a/src/Native/Unix/CMakeLists.txt b/src/Native/Unix/CMakeLists.txt -index 7d804a1e54..717c2718d7 100644 ---- a/src/Native/Unix/CMakeLists.txt -+++ b/src/Native/Unix/CMakeLists.txt -@@ -25,7 +25,6 @@ add_compile_options(-fPIC) - add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common) - add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common) - add_compile_options(-g) --add_compile_options(-Werror) - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5) - add_compile_options(-Wno-unreachable-code) - endif () diff --git a/src/Native/Unix/configure.cmake b/src/Native/Unix/configure.cmake index f4a30ad6cb..f2db68402a 100644 --- a/src/Native/Unix/configure.cmake diff --git a/dotnet2.1.spec b/dotnet2.1.spec index d70c0da..278847c 100644 --- a/dotnet2.1.spec +++ b/dotnet2.1.spec @@ -12,6 +12,12 @@ %global __provides_exclude ^(%{privlibs})\\.so %global __requires_exclude ^(%{privlibs})\\.so +# LTO triggers a compilation error for a source level issue. Given that LTO should not +# change the validity of any given source and the nature of the error (undefined enum), I +# suspect a generator program is mis-behaving in some way. This needs further debugging, +# until that's done, disable LTO. This has to happen before setting the flags below. +%define _lto_cflags %{nil} + # Filter flags not supported by clang/dotnet: # -fcf-protection is not supported by clang # -fstack-clash-protection is not supported by clang @@ -27,9 +33,9 @@ %global simple_name dotnet -%global host_version 2.1.19 -%global sdk_version 2.1.515 -%global runtime_version 2.1.19 +%global host_version 2.1.24 +%global sdk_version 2.1.520 +%global runtime_version 2.1.24 Name: %{simple_name}2.1 Version: %{sdk_version} @@ -47,11 +53,7 @@ Source2: dotnet.sh Patch100: corefx-32956-alpn.patch Patch101: corefx-optflags-support.patch -Patch200: coreclr-build-python3.patch -Patch201: coreclr-cmake-python3.patch -Patch202: coreclr-mscorlib.patch -Patch203: coreclr-pie.patch -Patch204: coreclr-28045-clang10.patch +Patch200: coreclr-pie.patch Patch300: core-setup-4510-commit-id.patch Patch301: core-setup-pie.patch @@ -236,10 +238,6 @@ popd pushd src/coreclr %patch200 -p1 -%patch201 -p1 -%patch202 -p1 -%patch203 -p1 -%patch204 -p1 popd pushd src/core-setup @@ -334,6 +332,9 @@ echo "Testing build results for debug symbols..." %{_libdir}/%{simple_name}/sdk/%{sdk_version} %changelog +* Thu Jan 21 2021 Omair Majid - 2.1.520-1 +- Update to .NET Core SDK 2.1.520 and Runtime 2.1.24 + * Wed Jun 10 2020 Omair Majid - 2.1.515-1 - Update to .NET Core Runtime 2.1.19 and SDK 2.1.515