From b2e2bac5e493b2bae8bf0cc9fb00b7d0f18907fc Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 14 Nov 2025 12:54:30 +0000 Subject: [PATCH] import CS dotnet9.0-9.0.111-2.el9 --- dotnet9.0.spec | 141 ++++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 84 deletions(-) diff --git a/dotnet9.0.spec b/dotnet9.0.spec index 25bf08b..4022d08 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -85,22 +85,22 @@ URL: https://github.com/dotnet/ # ./build-dotnet-bootstrap-tarball %%{upstream_tag} Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.gz # The bootstrap SDK version is one listed in the global.json file of the main source archive -%global bootstrap_sdk_version 9.0.101 +%global bootstrap_sdk_version 9.0.100-rc.1.24452.12 # Binaries can be at one of several different URLs: # GA releases: -Source1: https://builds.dotnet.microsoft.com/dotnet/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz +# Source1: https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz # Preview releases: -# Source1: https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz +Source1: https://dotnetbuilds.azureedge.net/public/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz # To generate ppc64le and s390x archives: # 1. Find the source commits and versions of repos, use one of: -# - https://builds.dotnet.microsoft.com/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt -# - https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt +# - https://dotnetbuilds.azureedge.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt +# - https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt # 2. Find the VMR sync commit using `git log --grep $commit` # 3. Build the VMR commit in cross-build mode for the architecture # 4. Use `build-prebuilt-archive` to create the archive from the VMR # 5. Update the version below to match the SDK that was built from the VMR # The ppc64le/s390x SDK version is one produced -%global bootstrap_sdk_version_ppc64le_s390x 9.0.101 +%global bootstrap_sdk_version_ppc64le_s390x 9.0.100-rc.1.24452.1 Source2: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-ppc64le.tar.gz Source3: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-s390x.tar.gz %else @@ -416,10 +416,10 @@ Requires: dotnet-sdk-%{dotnetver}%{?_isa} >= %{sdk_rpm_version}-%{release} # When installing AOT support, also install all dependencies needed to build # NativeAOT applications. AOT invokes `clang ... -lssl -lcrypto -lbrotlienc # -lbrotlidec -lz ...`. -Requires: brotli-devel -Requires: clang -Requires: openssl-devel -Requires: zlib-devel +Requires: brotli-devel%{?_isa} +Requires: clang%{?_isa} +Requires: openssl-devel%{?_isa} +Requires: zlib-devel%{?_isa} %description -n dotnet-sdk-aot-%{dotnetver} This package provides Ahead-of-time (AOT) compilation support for the .NET SDK. @@ -570,8 +570,6 @@ rm -rf src/runtime/src/native/external/zlib-intel rm -rf src/runtime/src/native/external/zlib-ng %endif -lscpu - %build @@ -615,14 +613,6 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//') CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//') %endif -%if 0%{?rhel} >= 10 -# Workaround for https://github.com/dotnet/runtime/issues/109611 -# FIXME: Remove this, and replace with upstream fix -CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //') -CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //') -LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //') -%endif - # Enabling fortify-source and "-Wall -Weverything" produces new warnings from libc. Turn them off. CFLAGS="$CFLAGS -Wno-used-but-marked-unused" CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused" @@ -663,9 +653,9 @@ max_attempts=1 %endif function retry_until_success { - local exit_code=1 - local tries=$1 - shift + local exit_code=1 + local tries=$1 + shift set +e while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do (( tries = tries - 1 )) @@ -676,38 +666,25 @@ function retry_until_success { return $exit_code } -cat >dotnet-rpm-build.sh < dotnet.sh @@ -910,83 +887,79 @@ export COMPlus_LTTng=0 %changelog * Tue Oct 14 2025 Omair Majid - 9.0.111-2 - Update to .NET SDK 9.0.111 and Runtime 9.0.10 -- Resolves: RHEL-116861 +- Resolves: RHEL-116858 * Wed Sep 10 2025 Omair Majid - 9.0.110-2 - Update to .NET SDK 9.0.110 and Runtime 9.0.9 -- Resolves: RHEL-112268 +- Resolves: RHEL-112269 * Mon Aug 11 2025 Omair Majid - 9.0.109-2 - Update to .NET SDK 9.0.109 and Runtime 9.0.8 -- Resolves: RHEL-106727 +- Resolves: RHEL-106728 * Tue Jul 08 2025 Omair Majid - 9.0.108-2 - Update to .NET SDK 9.0.108 and Runtime 9.0.7 -- Resolves: RHEL-100597 +- Resolves: RHEL-100599 * Wed Jun 11 2025 Omair Majid - 9.0.107-2 - Update to .NET SDK 9.0.107 and Runtime 9.0.6 -- Resolves: RHEL-94423 +- Resolves: RHEL-94421 * Tue May 13 2025 Omair Majid - 9.0.106-2 - Update to .NET SDK 9.0.106 and Runtime 9.0.5 -- Resolves: RHEL-89452 +- Resolves: RHEL-89450 * Wed Apr 09 2025 Omair Majid - 9.0.105-2 - Update to .NET SDK 9.0.105 and Runtime 9.0.4 -- Resolves: RHEL-85281 +- Resolves: RHEL-85280 * Tue Mar 11 2025 Omair Majid - 9.0.104-2 - Update to .NET SDK 9.0.104 and Runtime 9.0.3 -- Resolves: RHEL-81647 +- Resolves: RHEL-81648 * Mon Feb 17 2025 Omair Majid - 9.0.103-2 - Update to .NET SDK 9.0.103 and Runtime 9.0.2 -- Resolves: RHEL-76904 +- Resolves: RHEL-76905 -* Sat Jan 25 2025 Omair Majid - 9.0.102-2 -- Disable bootstrap -- Related: RHEL-71549 - -* Fri Jan 24 2025 Omair Majid - 9.0.102-1 -- Rebootstrap -- Related: RHEL-71549 - -* Thu Jan 16 2025 Omair Majid - 9.0.102-0.9 +* Thu Jan 16 2025 Omair Majid - 9.0.102-2 - Update to .NET SDK 9.0.102 and Runtime 9.0.1 -- Resolves: RHEL-71549 +- Resolves: RHEL-71550 -* Tue Oct 29 2024 Troy Dawson - 9.0.100~rc.2.24474.1-0.8 -- Bump release for October 2024 mass rebuild: - Resolves: RHEL-64018 +* Thu Dec 05 2024 Omair Majid - 9.0.101-3 +- Update to .NET SDK 9.0.101 and Runtime 9.0.0 +- Resolves: RHEL-69749 -* Wed Oct 23 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.7 +* Wed Nov 20 2024 Omair Majid - 9.0.100-2 +- Update to .NET SDK 9.0.100 and Runtime 9.0.0 +- Resolves: RHEL-65538 + +* Fri Oct 25 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.7 - Disable bootstrap -- Related: RHEL-62799 +- Related: RHEL-62776 * Tue Oct 22 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.6 - Rebootstrap -- Related: RHEL-62799 +- Related: RHEL-62776 * Thu Oct 17 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.5 - Add missing runtime dependencies to -aot- subpackage -- Related: RHEL-62799 +- Related: RHEL-62776 * Tue Oct 15 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.4 - Update to .NET SDK 9.0.100-rc.2.24474.1 and Runtime 9.0.0-rc.2.24473.5 -- Resolves: RHEL-62799 +- Resolves: RHEL-62776 * Wed Sep 11 2024 Omair Majid - 9.0.100~rc.1.24452.12-0.3 - Update to .NET SDK 9.0.100-rc.1.24452.12 and Runtime 9.0.0-rc.1.24431.7 -- Resolves: RHEL-59011 +- Resolves: RHEL-59026 * Sun Aug 18 2024 Omair Majid - 9.0.100~preview.7.24407.1-0.2 - Disable bootstrap -- Related: RHEL-48619 +- Related: RHEL-48617 * Thu Aug 15 2024 Omair Majid - 9.0.100~preview.7.24407.1-0.1 -- Update to .NET SDK 9 preview 7 and Runtime 9 preview 7 -- Resolves: RHEL-48619 +- Update to .NET SDK 9.0 preview 7 and Runtime 9.0 preview 7 +- Resolves: RHEL-48617 * Thu Jun 13 2024 Omair Majid - 9.0.100~preview.5.24307.3-0.9 - Update to .NET SDK 9.0.100-preview.5.24307.3 and Runtime