The package rpms/ldc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ldc.git/commit/?id=aced99b143affb...
https://src.fedoraproject.org/cgit/rpms/ldc.git/commit/?id=1e49e1bab833c7....
Change:
-%ifarch ppc64le
+%ifarch ppc64le
Thanks.
Full change:
============
commit 612cdee65bc71aaa471080ebe6d3294856985a12
Merge: 0aa6f68 67a5af7
Author: Kalev Lember <klember(a)redhat.com>
Date: Fri Dec 2 02:49:58 2022 +0100
Merge branch 'rawhide' of
ssh://pkgs.fedoraproject.org/rpms/ldc into rawhide
commit 0aa6f6829fa7d94983fc1a656a9f08c27b9d5002
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Sep 12 18:11:28 2022 +0200
Disable bootstrap
diff --git a/ldc.spec b/ldc.spec
index 9800906..22fb685 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -5,7 +5,7 @@
# 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.
-%bcond_without bootstrap
+%bcond_with bootstrap
%undefine _hardened_build
%undefine _package_note_file
commit eb1288a06dd795119854fd7b9cc005cf152535e4
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Sep 12 17:47:31 2022 +0200
Enable bootstrap
diff --git a/ldc.spec b/ldc.spec
index 22fb685..9800906 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -5,7 +5,7 @@
# 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.
-%bcond_with bootstrap
+%bcond_without bootstrap
%undefine _hardened_build
%undefine _package_note_file
commit aced99b143affb225e2d394e8d0d8fcbaa433d63
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Sep 12 17:44:36 2022 +0200
Revert "Bootstrap on ppc64le"
Drop all of the binaries now that we have done a bootstrap build.
This reverts commit 1e49e1bab833c7e39cda9d3abf756ed27e0ec532.
diff --git a/ldc.spec b/ldc.spec
index 73af452..22fb685 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,10 +1,6 @@
#global llvm_version 14
%global soversion 100
-%ifarch ppc64le
-%define debug_package %{nil}
-%endif
-
# 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
@@ -17,7 +13,7 @@
Name: ldc
Epoch: 1
Version: 1.30.0%{?pre:~%{pre}}
-Release: 2%{?dist}~bootstrap~ppc64le
+Release: 2%{?dist}
Summary: LLVM D Compiler
# The DMD frontend in dmd/* GPL version 1 or artistic license
@@ -25,10 +21,7 @@ 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...
-Source1: ldc-1.8.0-1.fc29.ppc64le.tar.xz
-Source2: llvm4.0-libs-4.0.1-6.fc29.ppc64le.tar.xz
Source3: macros.%{name}
-Source4: libffi-3.1-18.fc29.ppc64le.tar.xz
# Make sure /usr/include/d is in the include search path
Patch0: ldc-include-path.patch
@@ -42,10 +35,7 @@ BuildRequires: cmake
BuildRequires: gc
BuildRequires: gcc
BuildRequires: gcc-c++
-%ifarch ppc64le
-%else
BuildRequires: ldc
-%endif
BuildRequires: libconfig-devel
BuildRequires: libcurl-devel
BuildRequires: libedit-devel
@@ -101,11 +91,6 @@ Enable autocompletion for phobos library in geany (IDE)
mkdir geany_config
%build
-%ifarch ppc64le
-tar xvf %{SOURCE1}
-tar xvf %{SOURCE2}
-tar xvf %{SOURCE4}
-%else
# This package appears to be failing because links to the LLVM plugins
# are not installed which results in the tools not being able to
# interpret the .o/.a files. Disable LTO for now
@@ -133,23 +118,12 @@ popd
%{nil}
%cmake_build
-%endif
# generate geany tags
geany -c geany_config -g phobos.d.tags $(find runtime/phobos/std -name "*.d")
%install
-%ifarch ppc64le
-cp -a ldc-1.8.0-1.fc29.ppc64le/* %{buildroot}
-cp -a llvm4.0-libs-4.0.1-6.fc29.ppc64le/* %{buildroot}
-cp -a libffi-3.1-18.fc29.ppc64le/* %{buildroot}
-mv %{buildroot}%{_datadir}/licenses/libffi/ \
- %{buildroot}%{_datadir}/licenses/libffi-3.1/
-mv %{buildroot}%{_datadir}/doc/libffi/ \
- %{buildroot}%{_datadir}/doc/libffi-3.1/
-%else
%cmake_install
-%endif
# macros for D package
mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
@@ -169,15 +143,11 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%{_bindir}/ldc-profdata
%{_bindir}/ldc-prune-cache
%{_rpmconfigdir}/macros.d/macros.ldc
-%ifarch ppc64le
-%{_includedir}/d/
-%else
%dir %{_prefix}/lib/ldc
%dir %{_prefix}/lib/ldc/%{_target_platform}
%dir %{_prefix}/lib/ldc/%{_target_platform}/include
%{_prefix}/lib/ldc/%{_target_platform}/include/d/
%{_libdir}/ldc_rt.dso.o
-%endif
%{_libdir}/libdruntime-ldc-debug-shared.so
%{_libdir}/libdruntime-ldc-shared.so
%{_libdir}/libphobos2-ldc-debug-shared.so
@@ -189,27 +159,10 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%files libs
%license runtime/druntime/LICENSE.txt
%license runtime/phobos/LICENSE_1_0.txt
-%ifarch ppc64le
-%doc %{_datadir}/doc/ldc-druntime/README
-%doc %{_datadir}/doc/ldc-druntime/README.md
-%doc %{_datadir}/doc/libffi-3.1/README
-%license %{_datadir}/licenses/ldc-druntime/LICENSE
-%license %{_datadir}/licenses/ldc-phobos/LICENSE_1_0.txt
-%license %{_datadir}/licenses/libffi-3.1/LICENSE
-%license %{_datadir}/licenses/llvm4.0-libs/LICENSE.TXT
-%{_sysconfdir}/ld.so.conf.d/llvm4.0-ppc64le.conf
-%{_libdir}/llvm4.0/
-%{_libdir}/libffi.so.6*
-%{_libdir}/libdruntime-ldc-debug-shared.so.*
-%{_libdir}/libdruntime-ldc-shared.so.*
-%{_libdir}/libphobos2-ldc-debug-shared.so.*
-%{_libdir}/libphobos2-ldc-shared.so.*
-%else
%{_libdir}/libdruntime-ldc-debug-shared.so.%{soversion}*
%{_libdir}/libdruntime-ldc-shared.so.%{soversion}*
%{_libdir}/libphobos2-ldc-debug-shared.so.%{soversion}*
%{_libdir}/libphobos2-ldc-shared.so.%{soversion}*
-%endif
%files phobos-geany-tags
%{_datadir}/geany/tags/phobos.d.tags
diff --git a/sources b/sources
index 07fe12c..3573406 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
SHA512 (ldc-1.30.0-src.tar.gz) =
6da36e70cdb7e298b103642d40465fad7a08f05e5424ca9205783c9db867a2e75058d4d3b0124fe305ac69d853cd3dae41e179f80c5359d771f206b76a8b7e80
-SHA512 (ldc-1.8.0-1.fc29.ppc64le.tar.xz) =
b64cd376cd1fe1bf51858a64f9d1f026bad07e029b4443966d207fd57c6520a9f66063c3bed037dd1e0ac9c6e6b59398bd50f18baf1a303d58d6722a4e179e00
-SHA512 (llvm4.0-libs-4.0.1-6.fc29.ppc64le.tar.xz) =
7ef0e49b5472afa047a29c552dbacca0fcd8e50758cc000ac7f83595ab30bc1da63d7366ce5118e448a3de15943b70b657c08e74d0b05ce853903c1d9d529e6a
-SHA512 (libffi-3.1-18.fc29.ppc64le.tar.xz) =
b6587b117b905a0eac1f1e4d82b86b4618c4c0b923c32b403950ce69931b61aec23b9402455d885f772789e4c89143989429cb0e3dd1f69738ffd2115c369acc
commit 1e49e1bab833c7e39cda9d3abf756ed27e0ec532
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Sep 12 16:50:45 2022 +0200
Bootstrap on ppc64le
Use binaries from ldc-1.8.0-1.fc29, llvm4.0-4.0.1-6.fc29 and
libffi-3.1-18.fc29 builds to re-bootstrap ldc on the ppc64le
architecture.
Bootstrap Exception:
https://pagure.io/packaging-committee/issue/1209
diff --git a/ldc.spec b/ldc.spec
index b280c80..73af452 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,6 +1,10 @@
#global llvm_version 14
%global soversion 100
+%ifarch ppc64le
+%define debug_package %{nil}
+%endif
+
# 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
@@ -13,7 +17,7 @@
Name: ldc
Epoch: 1
Version: 1.30.0%{?pre:~%{pre}}
-Release: 1%{?dist}
+Release: 2%{?dist}~bootstrap~ppc64le
Summary: LLVM D Compiler
# The DMD frontend in dmd/* GPL version 1 or artistic license
@@ -21,21 +25,27 @@ 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...
+Source1: ldc-1.8.0-1.fc29.ppc64le.tar.xz
+Source2: llvm4.0-libs-4.0.1-6.fc29.ppc64le.tar.xz
Source3: macros.%{name}
+Source4: libffi-3.1-18.fc29.ppc64le.tar.xz
# Make sure /usr/include/d is in the include search path
Patch0: ldc-include-path.patch
# Don't add rpath to standard libdir
Patch1: ldc-no-default-rpath.patch
-ExclusiveArch: %{ldc_arches}
+ExclusiveArch: %{ldc_arches} ppc64le
BuildRequires: bash-completion
BuildRequires: cmake
BuildRequires: gc
BuildRequires: gcc
BuildRequires: gcc-c++
+%ifarch ppc64le
+%else
BuildRequires: ldc
+%endif
BuildRequires: libconfig-devel
BuildRequires: libcurl-devel
BuildRequires: libedit-devel
@@ -91,6 +101,11 @@ Enable autocompletion for phobos library in geany (IDE)
mkdir geany_config
%build
+%ifarch ppc64le
+tar xvf %{SOURCE1}
+tar xvf %{SOURCE2}
+tar xvf %{SOURCE4}
+%else
# This package appears to be failing because links to the LLVM plugins
# are not installed which results in the tools not being able to
# interpret the .o/.a files. Disable LTO for now
@@ -118,12 +133,23 @@ popd
%{nil}
%cmake_build
+%endif
# generate geany tags
geany -c geany_config -g phobos.d.tags $(find runtime/phobos/std -name "*.d")
%install
+%ifarch ppc64le
+cp -a ldc-1.8.0-1.fc29.ppc64le/* %{buildroot}
+cp -a llvm4.0-libs-4.0.1-6.fc29.ppc64le/* %{buildroot}
+cp -a libffi-3.1-18.fc29.ppc64le/* %{buildroot}
+mv %{buildroot}%{_datadir}/licenses/libffi/ \
+ %{buildroot}%{_datadir}/licenses/libffi-3.1/
+mv %{buildroot}%{_datadir}/doc/libffi/ \
+ %{buildroot}%{_datadir}/doc/libffi-3.1/
+%else
%cmake_install
+%endif
# macros for D package
mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
@@ -143,11 +169,15 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%{_bindir}/ldc-profdata
%{_bindir}/ldc-prune-cache
%{_rpmconfigdir}/macros.d/macros.ldc
+%ifarch ppc64le
+%{_includedir}/d/
+%else
%dir %{_prefix}/lib/ldc
%dir %{_prefix}/lib/ldc/%{_target_platform}
%dir %{_prefix}/lib/ldc/%{_target_platform}/include
%{_prefix}/lib/ldc/%{_target_platform}/include/d/
%{_libdir}/ldc_rt.dso.o
+%endif
%{_libdir}/libdruntime-ldc-debug-shared.so
%{_libdir}/libdruntime-ldc-shared.so
%{_libdir}/libphobos2-ldc-debug-shared.so
@@ -159,15 +189,35 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%files libs
%license runtime/druntime/LICENSE.txt
%license runtime/phobos/LICENSE_1_0.txt
+%ifarch ppc64le
+%doc %{_datadir}/doc/ldc-druntime/README
+%doc %{_datadir}/doc/ldc-druntime/README.md
+%doc %{_datadir}/doc/libffi-3.1/README
+%license %{_datadir}/licenses/ldc-druntime/LICENSE
+%license %{_datadir}/licenses/ldc-phobos/LICENSE_1_0.txt
+%license %{_datadir}/licenses/libffi-3.1/LICENSE
+%license %{_datadir}/licenses/llvm4.0-libs/LICENSE.TXT
+%{_sysconfdir}/ld.so.conf.d/llvm4.0-ppc64le.conf
+%{_libdir}/llvm4.0/
+%{_libdir}/libffi.so.6*
+%{_libdir}/libdruntime-ldc-debug-shared.so.*
+%{_libdir}/libdruntime-ldc-shared.so.*
+%{_libdir}/libphobos2-ldc-debug-shared.so.*
+%{_libdir}/libphobos2-ldc-shared.so.*
+%else
%{_libdir}/libdruntime-ldc-debug-shared.so.%{soversion}*
%{_libdir}/libdruntime-ldc-shared.so.%{soversion}*
%{_libdir}/libphobos2-ldc-debug-shared.so.%{soversion}*
%{_libdir}/libphobos2-ldc-shared.so.%{soversion}*
+%endif
%files phobos-geany-tags
%{_datadir}/geany/tags/phobos.d.tags
%changelog
+* Mon Sep 12 2022 Kalev Lember <klember(a)redhat.com> - 1:1.30.0-2
+- Bootstrap on ppc64le
+
* Tue Jul 26 2022 Kalev Lember <klember(a)redhat.com> - 1:1.30.0-1
- Update to 1.30.0
- Build with llvm 14
diff --git a/sources b/sources
index 3573406..07fe12c 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
SHA512 (ldc-1.30.0-src.tar.gz) =
6da36e70cdb7e298b103642d40465fad7a08f05e5424ca9205783c9db867a2e75058d4d3b0124fe305ac69d853cd3dae41e179f80c5359d771f206b76a8b7e80
+SHA512 (ldc-1.8.0-1.fc29.ppc64le.tar.xz) =
b64cd376cd1fe1bf51858a64f9d1f026bad07e029b4443966d207fd57c6520a9f66063c3bed037dd1e0ac9c6e6b59398bd50f18baf1a303d58d6722a4e179e00
+SHA512 (llvm4.0-libs-4.0.1-6.fc29.ppc64le.tar.xz) =
7ef0e49b5472afa047a29c552dbacca0fcd8e50758cc000ac7f83595ab30bc1da63d7366ce5118e448a3de15943b70b657c08e74d0b05ce853903c1d9d529e6a
+SHA512 (libffi-3.1-18.fc29.ppc64le.tar.xz) =
b6587b117b905a0eac1f1e4d82b86b4618c4c0b923c32b403950ce69931b61aec23b9402455d885f772789e4c89143989429cb0e3dd1f69738ffd2115c369acc