From 3c32b4be2cc7ab6a04a0fd6240258e76ce1a825e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 30 Apr 2020 10:33:53 +0200 Subject: BSD: prevent failing due to broken deps generator some FreeBSD CPAN smokers sometimes fails with: error: Couldn't exec /usr/local/lib/rpm/elfdeps: No such file or directory The testsuite passes smoothly before & after that change. The only impact is that with that, t/media/rpm-query-in-scriptlet/rpm-query-in-scriptlet-1-1.x86_64.rpm lose one requires on one of its own provides: removed REQUIRES librpm.so.9()(64bit) Which is fine. --- NEWS | 1 + t/02create_pkgs.t | 3 +++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 8213d678..983c7a4d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ - cpan_testers: + o BSD: prevent failing due to broken deps generator 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 diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t index d052f5b3..cbb562c5 100644 --- a/t/02create_pkgs.t +++ b/t/02create_pkgs.t @@ -92,6 +92,9 @@ sub rpmbuild { # unsetting %__os_install_post fixes failure to build on FreeBSD: $extra_args .= " --define '__os_install_post %nil'"; $extra_args .= " --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' "; + # some FreeBSD CPAN smokers sometimes fails with: + # error: Couldn't exec /usr/local/lib/rpm/elfdeps: No such file or directory + $extra_args .= " --define '__elf_provides %nil' --define '__elf_requires %nil'" if $is_bsd; system_("rpmbuild --quiet --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $extra_args $spec"); my ($name) = $spec =~ m!([^/]*)\.spec$!; -- cgit v1.2.1