summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-04-29 18:21:50 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-05-01 00:35:11 +0200
commit8169b1b90fce87850da1829efe4267b00ab717dc (patch)
tree69a0e105d4ad7be56ecc73df8a973b6f231a9522
parent378c25612aa4b202bf3b55182b9bab5a83890a02 (diff)
downloadurpmi-8169b1b90fce87850da1829efe4267b00ab717dc.tar
urpmi-8169b1b90fce87850da1829efe4267b00ab717dc.tar.gz
urpmi-8169b1b90fce87850da1829efe4267b00ab717dc.tar.bz2
urpmi-8169b1b90fce87850da1829efe4267b00ab717dc.tar.xz
urpmi-8169b1b90fce87850da1829efe4267b00ab717dc.zip
fix testuite if glibc-static-devel isn't installed
On some older distributions (eg: Mageia 2), it would fail.
-rw-r--r--NEWS1
-rw-r--r--t/data/SPECS/ordering-scriptlets/a_1.spec2
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 7545da09..5a542477 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
- cpan_testers:
o do not skip network tests on pre-UsrMove distros (eg: Mageia 2)
o fix running testsuite with rpm-4.9
+ o fix testuite if glibc-static-devel isn't installed on Mageia 2
Version 8.122 - 28 April 2020
diff --git a/t/data/SPECS/ordering-scriptlets/a_1.spec b/t/data/SPECS/ordering-scriptlets/a_1.spec
index a4a0b1cd..749df99b 100644
--- a/t/data/SPECS/ordering-scriptlets/a_1.spec
+++ b/t/data/SPECS/ordering-scriptlets/a_1.spec
@@ -8,6 +8,8 @@ Release: 1
License: x
Provides: /bin/a
#BuildRequires: gcc
+# Fix testsuite on eg: mga2 if static build fails and libc got included:
+Provides: rtld(GNU_HASH)
%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^libc.so|^ld
%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^libc.so|^ld