diff --git a/ldc.spec b/ldc.spec index 6587889..ba8c1fc 100644 --- a/ldc.spec +++ b/ldc.spec @@ -7,12 +7,7 @@ %global llvm_version 12 -# bootstrap_stage1 is for bringing up a D compiler for the very first time, -# without having a working D compiler in the build root. -%global bootstrap_stage1 0 -%global bootstrap_stage1_ldc_version 0.17.6 - -# bootstrap_stage2 is for updating LDC to a newer version: it relies on an +# bootstrapping is used for updating LDC to a newer version: it relies on an # older, working LDC compiler in the buildroot, which is then used to build a # new intermediate LDC version, and finally this in turn is used to build the # final compiler that gets installed in the rpm. @@ -31,9 +26,6 @@ Summary: LLVM D Compiler License: BSD URL: https://github.com/ldc-developers/ldc Source0: https://github.com/ldc-developers/ldc/releases/download/v%{version}%{?pre:-%{pre}}/%{name}-%{version}%{?pre:-%{pre}}-src.tar.gz -%if 0%{?bootstrap_stage1} -Source1: https://github.com/ldc-developers/ldc/releases/download/v%{bootstrap_stage1_ldc_version}/%{name}-%{bootstrap_stage1_ldc_version}-src.tar.gz -%endif Source3: macros.%{name} # Make sure /usr/include/d is in the include search path @@ -48,9 +40,7 @@ BuildRequires: cmake BuildRequires: gc BuildRequires: gcc BuildRequires: gcc-c++ -%if ! 0%{?bootstrap_stage1} BuildRequires: ldc -%endif BuildRequires: libconfig-devel BuildRequires: libcurl-devel BuildRequires: libedit-devel @@ -138,24 +128,11 @@ mkdir geany_config %global optflags %{optflags} -fno-strict-aliasing -%if 0%{?bootstrap_stage1} -tar xf %{SOURCE1} -mkdir build-bootstrap1 -pushd build-bootstrap1 -cmake -DLLVM_CONFIG:PATH=llvm-config%{?llvm_version:-%{llvm_version}} \ - ../%{name}-%{bootstrap_stage1_ldc_version}-src -make %{?_smp_mflags} -popd -%endif - %if 0%{?bootstrap_stage2} tar xf %{SOURCE0} -mkdir build-bootstrap2 -pushd build-bootstrap2 +mkdir build-bootstrap +pushd build-bootstrap cmake -DLLVM_CONFIG:PATH=llvm-config%{?llvm_version:-%{llvm_version}} \ -%if 0%{?bootstrap_stage1} - -DD_COMPILER:PATH=`pwd`/../build-bootstrap1/bin/ldmd2 \ -%endif ../%{name}-%{version}%{?pre:-%{pre}}-src make %{?_smp_mflags} popd @@ -166,7 +143,7 @@ popd -DBASH_COMPLETION_COMPLETIONSDIR:PATH=%{_datadir}/bash-completion/completions \ -DLLVM_CONFIG:PATH=llvm-config%{?llvm_version:-%{llvm_version}} \ %if 0%{?bootstrap_stage2} - -DD_COMPILER:PATH=`pwd`/build-bootstrap2/bin/ldmd2 \ + -DD_COMPILER:PATH=`pwd`/build-bootstrap/bin/ldmd2 \ %endif %{nil} diff --git a/sources b/sources index 46e32ec..724dc8c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ldc-0.17.6-src.tar.gz) = 433a3582bb5214004a676741d7483ed87066b47b8bfec4633796ca5a717c78ea54ee7b9c2ce1cf7bc399082802f15133d28cb4884b879326d224f48687af68e3 SHA512 (ldc-1.27.1-src.tar.gz) = d10118c9c52a26510f3f9d8d93b38f89144aca7b861ef663e807df0bcf1bb3bc12d1410e6617891e58a3f2cfe160e31bb8478bb1f39f79d026c97ce7e72a9f65