diff --git a/_multibuild b/_multibuild index a8c451b..30d332b 100644 --- a/_multibuild +++ b/_multibuild @@ -3,6 +3,7 @@ utils testsuite cross-aarch64 + cross-ppc64le cross-riscv64 cross-s390x diff --git a/glibc.changes b/glibc.changes index c6c8c01..a7114dc 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,7 +1,6 @@ -------------------------------------------------------------------- -Wed Aug 23 06:47:17 UTC 2023 - Richard Biener +Mon Aug 28 11:56:10 UTC 2023 - Richard Biener -- Remove not working cross-ppc64le and cross-x86_64 again. +- Add cross-ppc64le package ------------------------------------------------------------------- Tue Aug 22 15:46:51 UTC 2023 - Andreas Schwab @@ -13,7 +12,7 @@ Tue Aug 22 15:46:51 UTC 2023 - Andreas Schwab ------------------------------------------------------------------- Tue Aug 22 11:24:16 UTC 2023 - Richard Biener -- Add cross-s390x, cross-ppc64le and cross-x86_64 packages. [bsc#1214460] +- Add cross-s390x package (bsc#1214460) ------------------------------------------------------------------- Mon Aug 14 08:12:28 UTC 2023 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index fa3278d..9743132 100644 --- a/glibc.spec +++ b/glibc.spec @@ -30,18 +30,23 @@ # can use only simple RPM expressions, no lua, no shell, no '{expand:' # expression :-/ Ideally we'd like to just strip the 'cross_' prefix, # but we can't. So enumerate the possibilities for now. +%define cross_arch %{cross_cpu} %if "%flavor" == "cross-aarch64" -%define cross_arch aarch64 +%define cross_cpu aarch64 %endif %if "%flavor" == "cross-riscv64" -%define cross_arch riscv64 +%define cross_cpu riscv64 %endif %if "%flavor" == "cross-s390x" -%define cross_arch s390x +%define cross_cpu s390x +%endif +%if "%flavor" == "cross-ppc64le" +%define cross_arch ppc64le +%define cross_cpu powerpc64le %endif -%if 0%{?cross_arch:1} -%define binutils_os %{cross_arch}-suse-linux +%if 0%{?cross_cpu:1} +%define binutils_os %{cross_cpu}-suse-linux # use same sysroot as in binutils.spec %define sysroot %{_prefix}/%{binutils_os}/sys-root %endif @@ -84,7 +89,7 @@ ExclusiveArch: do_not_build %define build_utils 0 %define build_testsuite 1 %endif -%if 0%{?cross_arch:1} +%if 0%{?cross_cpu:1} %define build_main 0 %define build_utils 0 %define build_testsuite 0 @@ -92,7 +97,7 @@ ExclusiveArch: do_not_build %undefine _build_create_debug ExcludeArch: %{cross_arch} %endif -%define host_arch %{?cross_arch}%{!?cross_arch:%{_target_cpu}} +%define host_arch %{?cross_cpu}%{!?cross_cpu:%{_target_cpu}} %if %{build_main} %define name_suffix %{nil} @@ -604,8 +609,8 @@ BuildCCplus="%__cxx" #now overwrite for some architectures # %if %{build_cross} -BuildCC=%{cross_arch}-suse-linux-gcc -BuildCCplus=%{cross_arch}-suse-linux-g++ +BuildCC=%{cross_cpu}-suse-linux-gcc +BuildCCplus=%{cross_cpu}-suse-linux-g++ %else %ifarch sparc64 BuildFlags="-O2 -mcpu=ultrasparc -mvis -fcall-used-g6"