From d23997fd8cb2cd9af35d191ac92c5f71afb4018a2bfeeb458fd8ccf3ce3a6257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 30 Jan 2025 11:02:10 +0000 Subject: [PATCH] - enable config.guess/sub update also for loongarch64 architecture - update config.guess/sub files to current state from autoconf-2.72 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=685 --- auto-config-update-aarch64-ppc64le.diff | 3 ++- build-aux.tar.bz2 | 4 ++-- python-rpm.changes | 2 +- rpm.changes | 6 ++++++ rpm.spec | 8 ++++---- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff index 9e0f612..1c098a2 100644 --- a/auto-config-update-aarch64-ppc64le.diff +++ b/auto-config-update-aarch64-ppc64le.diff @@ -1,6 +1,6 @@ --- build/parseSimpleScript.c.orig 2024-12-16 09:59:01.199053527 +0000 +++ build/parseSimpleScript.c 2024-12-16 10:08:22.389914963 +0000 -@@ -59,6 +59,27 @@ int parseSimpleScript(rpmSpec spec, cons +@@ -59,6 +59,28 @@ int parseSimpleScript(rpmSpec spec, cons target = &buf; } @@ -13,6 +13,7 @@ + " aarch64) mints=20120610;;\n" + " ppc64le) mints=20130610;;\n" + " riscv64) mints=20160911;;\n" ++ " loongarch64) mints=20201222;;\n" + "esac\n" + "for s in guess sub; do\n" + " for c in $(find -maxdepth 8 -name \"config.$s\"); do\n" diff --git a/build-aux.tar.bz2 b/build-aux.tar.bz2 index 60c0356..70ed79a 100644 --- a/build-aux.tar.bz2 +++ b/build-aux.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69ead89491a66ae6c1a960977b7cc567e56f74d535a022fc193334d78be838f1 -size 21222 +oid sha256:85df6005b9b78efe6bbe3341b3d260915aab3b5660d33886aa7e4b2c540f68e9 +size 24182 diff --git a/python-rpm.changes b/python-rpm.changes index 1c872ab..51915c7 100644 --- a/python-rpm.changes +++ b/python-rpm.changes @@ -41,7 +41,7 @@ Fri Dec 2 15:09:55 CET 2022 - mls@suse.de - update to rpm-4.18.0 ------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de - update to rpm-4.17.1 diff --git a/rpm.changes b/rpm.changes index 35e2920..ed8ea30 100644 --- a/rpm.changes +++ b/rpm.changes @@ -48,6 +48,12 @@ Mon Dec 16 11:55:23 CET 2024 - mls@suse.de - backport unshare fix from upstream and extend it a bit * new patch: unshare.diff +------------------------------------------------------------------- +Fri Nov 29 10:18:48 UTC 2024 - Adrian Schröter + +- enable config.guess/sub update also for loongarch64 architecture +- update config.guess/sub files to current state from autoconf-2.72 + ------------------------------------------------------------------- Mon Nov 11 08:43:56 UTC 2024 - Michal Suchanek diff --git a/rpm.spec b/rpm.spec index b701289..0b5f93c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -211,7 +211,7 @@ and requires some packages that are usually required. %prep %setup -q -n rpm-%{version} -%ifarch aarch64 ppc64le riscv64 +%ifarch aarch64 ppc64le riscv64 loongarch64 tar xf %{SOURCE14} %endif pushd rpmio @@ -240,7 +240,7 @@ rm -rf sqlite %patch -P 141 -P 142 %patch -P 150 -P 151 -P 152 -P 153 -P 154 -%ifarch aarch64 ppc64le riscv64 +%ifarch aarch64 ppc64le riscv64 loongarch64 %patch -P 6464 %endif @@ -354,7 +354,7 @@ for i in /usr/share/automake-*/*; do fi done popd -%ifarch aarch64 ppc64le riscv64 +%ifarch aarch64 ppc64le riscv64 loongarch64 install -m 755 build-aux/config.guess %{buildroot}/usr/lib/rpm install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm %endif @@ -481,7 +481,7 @@ fi /usr/lib/rpm/fileattrs/ /usr/lib/rpm/*.prov /usr/lib/rpm/*.req -%ifarch aarch64 ppc64le riscv64 +%ifarch aarch64 ppc64le riscv64 loongarch64 /usr/lib/rpm/config.guess /usr/lib/rpm/config.sub %endif