Fix bootstrap macro
RHEL and CentOS Stream 8 don't seem to like the bootstrap macro name. Use another name for it. Related: RHBZ#2228550
This commit is contained in:
parent
b5261651ff
commit
a7c04bbe7a
@ -1,4 +1,4 @@
|
||||
%bcond_without bootstrap
|
||||
%bcond_without bootstrap_dotnet
|
||||
|
||||
# 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
|
||||
@ -60,7 +60,7 @@ License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APS
|
||||
|
||||
URL: https://github.com/dotnet/
|
||||
|
||||
%if %{with bootstrap}
|
||||
%if %{with bootstrap_dotnet}
|
||||
%global bootstrap_sdk_version 8.0.100-preview.6.23330.14
|
||||
%global tarball_name dotnet-%{upstream_tag}-x64-bootstrap
|
||||
# The source is generated on a Fedora box via:
|
||||
@ -103,7 +103,7 @@ ExclusiveArch: x86_64
|
||||
BuildRequires: clang
|
||||
BuildRequires: cmake
|
||||
BuildRequires: coreutils
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
BuildRequires: dotnet-sdk-%{dotnetver}
|
||||
BuildRequires: dotnet-sdk-%{dotnetver}-source-built-artifacts
|
||||
%endif
|
||||
@ -374,7 +374,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
%setup -q -n dotnet-%{upstream_tag}
|
||||
|
||||
# Remove all prebuilts
|
||||
@ -448,7 +448,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
|
||||
%build
|
||||
cat /etc/os-release
|
||||
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
# We need to create a copy because we will mutate this
|
||||
cp -a %{_libdir}/dotnet previously-built-dotnet
|
||||
find previously-built-dotnet
|
||||
@ -502,7 +502,7 @@ export COMPlus_LTTng=0
|
||||
export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||
|
||||
VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
--with-sdk previously-built-dotnet \
|
||||
%endif
|
||||
%ifarch %{mono_archs}
|
||||
|
Loading…
Reference in New Issue
Block a user