diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index 21b2f55..ce1ac50 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -17be2cc793acd02bb59a6a08616045c2fd1177b8 SOURCES/dotnet-v6.0.104-SDK.tar.gz +fabf7d61080026082feb263ff7cb6bf5d110cb89 SOURCES/dotnet-v6.0.103-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 1f6646c..648d0f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.104-SDK.tar.gz +SOURCES/dotnet-v6.0.103-SDK.tar.gz diff --git a/SOURCES/check-debug-symbols.py b/SOURCES/check-debug-symbols.py index be26d87..53d5fd2 100755 --- a/SOURCES/check-debug-symbols.py +++ b/SOURCES/check-debug-symbols.py @@ -65,7 +65,7 @@ def scan_file(file): def is_elf(file): result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True) - return re.search('ELF 64-bit LSB (?:executable|shared object)', result.stdout) + return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout) def scan_file_if_sensible(file): if is_elf(file): diff --git a/SOURCES/command-line-api-use-work-tree-with-git-apply.patch b/SOURCES/command-line-api-use-work-tree-with-git-apply.patch deleted file mode 100644 index 552d59d..0000000 --- a/SOURCES/command-line-api-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7a752928ed3588246c4b296feb6cf4946f1b29b7 Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Thu, 9 Sep 2021 12:11:39 -0400 -Subject: [PATCH] [ArPow] Use --work-tree with git apply - -This makes things work better in a source-tarball build, where there may -be a .git directory but it's for a different repo than command-line-api. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index 6cc85018..5e223747 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - --- -2.31.1 - diff --git a/SOURCES/fsharp-use-work-tree-with-git-apply.patch b/SOURCES/fsharp-use-work-tree-with-git-apply.patch deleted file mode 100644 index 810cf67..0000000 --- a/SOURCES/fsharp-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - diff --git a/SOURCES/runtime-66594-s390x-debuginfo.patch b/SOURCES/runtime-66594-s390x-debuginfo.patch new file mode 100644 index 0000000..5637645 --- /dev/null +++ b/SOURCES/runtime-66594-s390x-debuginfo.patch @@ -0,0 +1,29 @@ +diff --git a/src/mono/mono.proj b/src/mono/mono.proj +index fb98ffc1896..d6a0c9a8ec2 100644 +--- a/src/mono/mono.proj ++++ b/src/mono/mono.proj +@@ -519,17 +519,17 @@ + + <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy + +- ++ + + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + diff --git a/SOURCES/vstest-use-work-tree-with-git-apply.patch b/SOURCES/vstest-use-work-tree-with-git-apply.patch deleted file mode 100644 index 58c139f..0000000 --- a/SOURCES/vstest-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b2c4b2427d8c1a2410c4210789caccf1ec87e64a Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Thu, 9 Sep 2021 13:21:51 -0400 -Subject: [PATCH] [ArPow] Use --work-tree with git apply - -This makes things work better in a source-tarball build, where there may -be a .git directory somewhere in our parent directories but it's for a -different repo than vstest. In a situation like that a plain `git apply` -will (silently!) ignore patches because they wont apply to the unrelated -repository. That will (eventually) make the source-build fail. -`--work-tree` makes git directly use the directory that we care about. - -See https://github.com/dotnet/source-build/issues/2445 for more details. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index b365645c..68f82592 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -24,7 +24,7 @@ - - - - --- -2.31.1 - diff --git a/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch b/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch deleted file mode 100644 index 810cf67..0000000 --- a/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -15,7 +15,7 @@ - - - - diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 72969be..1d7627d 100644 --- a/SPECS/dotnet6.0.spec +++ b/SPECS/dotnet6.0.spec @@ -20,10 +20,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.4 -%global runtime_version 6.0.4 +%global host_version 6.0.3 +%global runtime_version 6.0.3 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.104 +%global sdk_version 6.0.103 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -60,7 +60,7 @@ Name: dotnet6.0 Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 5%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -87,20 +87,11 @@ Source11: dotnet.sh.in Patch100: runtime-arm64-lld-fix.patch # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315 Patch101: runtime-mono-remove-ilstrip.patch +# https://github.com/dotnet/runtime/pull/66594 +Patch102: runtime-66594-s390x-debuginfo.patch -# https://github.com/dotnet/command-line-api/pull/1401 -Patch300: command-line-api-use-work-tree-with-git-apply.patch - -# https://github.com/microsoft/vstest/pull/3046 -Patch400: vstest-use-work-tree-with-git-apply.patch - -# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied -Patch500: fsharp-use-work-tree-with-git-apply.patch # Disable apphost, needed for s390x -Patch501: fsharp-no-apphost.patch - -# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied -Patch600: xliff-tasks-use-work-tree-with-git-apply.patch +Patch500: fsharp-no-apphost.patch # Disable apphost, needed for s390x Patch700: arcade-no-apphost.patch @@ -128,7 +119,6 @@ Patch1501: sdk-22373-portablerid.patch # https://github.com/dotnet/installer/pull/12516 Patch1600: installer-12516-portablerid.patch - %if 0%{?fedora} || 0%{?rhel} >= 8 ExclusiveArch: aarch64 x86_64 s390x %else @@ -242,6 +232,8 @@ Requires: dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-%{release} # libicu is dlopen()ed Requires: libicu%{?_isa} +# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt +Provides: bundled(libbrotli) = 1.0.9 %if %{use_bundled_libunwind} # See runtime.*/src/coreclr/pal/src/libunwind/libunwind-version.txt Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1 @@ -404,29 +396,14 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehost/hostmisc/pal.unix.cpp -# Disable warnings -# sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props - pushd src/runtime.* %patch100 -p1 %patch101 -p1 -popd - -pushd src/command-line-api.* -%patch300 -p1 -popd - -pushd src/vstest.* -%patch400 -p1 +%patch102 -p1 popd pushd src/fsharp.* %patch500 -p1 -%patch501 -p1 -popd - -pushd src/xliff-tasks.* -%patch600 -p1 popd pushd src/arcade.* @@ -462,10 +439,6 @@ pushd src/installer.* %patch1600 -p1 popd -# Disable package validation which breaks our build, even though we -# are injecting "blessed" nuget packages produced by Microsoft. -# There's no need to run validation in RPM packages anyway. -sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime.*/eng/SourceBuild.props %if ! %{use_bundled_libunwind} sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props @@ -493,24 +466,28 @@ export CXXFLAGS="%{dotnet_cflags}" export LDFLAGS="%{dotnet_ldflags}" %endif +# -fstack-clash-protection breaks CoreCLR +CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-clash-protection//' ) +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-clash-protection//' ) + %ifarch aarch64 # -mbranch-protection=standard breaks unwinding in CoreCLR through libunwind CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //') CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //') %endif -# -fstack-clash-protection breaks CoreCLR -CFLAGS=$(echo $CFLAGS | sed -e 's/-fstack-clash-protection//' ) -CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-fstack-clash-protection//' ) +%ifarch s390x +# -march=z13 -mtune=z14 makes clang crash while compiling .NET +CFLAGS=$(echo $CFLAGS | sed -e 's/ -march=z13//') +CFLAGS=$(echo $CFLAGS | sed -e 's/ -mtune=z14//') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//') +%endif export EXTRA_CFLAGS="$CFLAGS" export EXTRA_CXXFLAGS="$CXXFLAGS" export EXTRA_LDFLAGS="$LDFLAGS" -unset CFLAGS -unset CXXFLAGS -unset LDFLAGS - VERBOSE=1 ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ @@ -534,14 +511,13 @@ ls artifacts/%{runtime_arch}/Release tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/ # See https://github.com/dotnet/source-build/issues/2579 -find %{buildroot}%{_libdir}/dotnet/ -iname testhost.x86 -delete -find %{buildroot}%{_libdir}/dotnet/ -iname vstest.console -delete +find %{buildroot}%{_libdir}/dotnet/ -type f -iname testhost.x86 -delete +find %{buildroot}%{_libdir}/dotnet/ -type f -iname vstest.console -delete -# Install managed symbols. Disabled until we find a fix for the build -# system embedding hardcoded source code paths. More at -# https://github.com/dotnet/source-build/issues/2623 +# Install managed symbols +# Disabled until https://github.com/dotnet/source-build/issues/2623 is sorted out # tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-*%%{runtime_version}*.tar.gz \ -# -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/ +# -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/ # Fix executable permissions on files find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \; @@ -584,7 +560,6 @@ install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ - # Quick and dirty check for https://github.com/dotnet/source-build/issues/2731 test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props @@ -651,37 +626,20 @@ echo "Testing build results for debug symbols..." %changelog -* Fri Apr 08 2022 Omair Majid - 6.0.104-1 -- Update to .NET SDK 6.0.104 and Runtime 6.0.4 -- Resolves: RHBZ#2073446 - -* Mon Mar 07 2022 Omair Majid - 6.0.103-4 -- Rebuild against .NET 6.0.102 to pick up the correct fixes -- Resolves: RHBZ#2059640 - -* Fri Mar 04 2022 Omair Majid - 6.0.103-3 -- Update to new source release for SDK 6.0.103 and Runtime 6.0.3 -- Resolves: RHBZ#2059640 - -* Thu Mar 03 2022 Omair Majid - 6.0.103-2 -- Switch to new source release for SDK 6.0.103 and Runtime 6.0.3 -- Resolves: RHBZ#2059640 - -* Tue Mar 01 2022 Omair Majid - 6.0.103-1 +* Wed Mar 23 2022 Omair Majid - 6.0.103-5 - Update to .NET SDK 6.0.103 and Runtime 6.0.3 -- Resolves: RHBZ#2059640 +- Resolves: RHBZ#2059636 -* Mon Jan 31 2022 Omair Majid - 6.0.102-1 +* Thu Feb 17 2022 Omair Majid - 6.0.102-1 - Update to .NET SDK 6.0.102 and Runtime 6.0.2 -- Resolves: RHBZ#2048257 +- Resolves: RHBZ#2030390 +- Resolves: RHBZ#2048256 -* Wed Dec 15 2021 Omair Majid - 6.0.101-1 -- Fix userlocal workload install -- Related: RHBZ#2030391 - -* Wed Dec 08 2021 Omair Majid - 6.0.101-1 -- Update to .NET SDK 6.0.101 and Runtime 6.0.1 -- Resolves: RHBZ#2030391 +* Fri Dec 10 2021 Omair Majid - 6.0.100-1 +- Fix build against clang 13 +- Resolves: RHBZ#2003061 +- Resolves: RHBZ#2015536 +- Resolves: RHBZ#2014666 * Sun Oct 31 2021 Omair Majid - 6.0.100-0.10 - Disable bootstrap