Source: jq Version: 1.7.1-2 Tags: patch User: debian-cr...@lists.debian.org Usertags: cross-satisfiability
We want to remove libtool-bin from Debian, because it is fundamentally incompatible with cross compilation. Often, using libtool-bin indicates a way of using libtool that is not intended. This is also the case for jq: It mixes two different libtools. I'm attaching a patch that makes it rely on the internal libtool during tests and hence removes the need for an external libtool for running tests. Helmut
diff --minimal -Nru jq-1.7.1/debian/changelog jq-1.7.1/debian/changelog --- jq-1.7.1/debian/changelog 2023-12-17 16:08:11.000000000 +0100 +++ jq-1.7.1/debian/changelog 2024-02-25 09:23:47.000000000 +0100 @@ -1,3 +1,10 @@ +jq (1.7.1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Stop using libtool-bin. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Sun, 25 Feb 2024 09:23:47 +0100 + jq (1.7.1-2) unstable; urgency=high * Remove valgrind [i386] to fix FTBFS. (Closes: #1058870) diff --minimal -Nru jq-1.7.1/debian/control jq-1.7.1/debian/control --- jq-1.7.1/debian/control 2023-12-17 16:03:29.000000000 +0100 +++ jq-1.7.1/debian/control 2024-02-25 09:23:47.000000000 +0100 @@ -6,7 +6,7 @@ bison, flex, libonig-dev, - libtool-bin, + libtool, python3-jinja2, python3-yaml, python3-markdown, diff --minimal -Nru jq-1.7.1/debian/patches/libtool.patch jq-1.7.1/debian/patches/libtool.patch --- jq-1.7.1/debian/patches/libtool.patch 1970-01-01 01:00:00.000000000 +0100 +++ jq-1.7.1/debian/patches/libtool.patch 2024-02-25 09:23:46.000000000 +0100 @@ -0,0 +1,11 @@ +--- jq-1.7.1.orig/tests/setup ++++ jq-1.7.1/tests/setup +@@ -13,7 +13,7 @@ + JQ=${JQ:-$JQBASEDIR/jq} + + if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then +- VALGRIND="libtool --mode=execute -- valgrind --error-exitcode=1 --leak-check=full \ ++ VALGRIND="$JQBASEDIR/libtool --mode=execute -- valgrind --error-exitcode=1 --leak-check=full \ + --suppressions=$JQTESTDIR/onig.supp \ + --suppressions=$JQTESTDIR/local.supp" + VG_EXIT0=--error-exitcode=0 diff --minimal -Nru jq-1.7.1/debian/patches/series jq-1.7.1/debian/patches/series --- jq-1.7.1/debian/patches/series 2023-12-15 21:36:42.000000000 +0100 +++ jq-1.7.1/debian/patches/series 2024-02-25 09:23:25.000000000 +0100 @@ -3,3 +3,4 @@ 0008-Do-not-use-venderized-oniguruma.patch disable-static-libtool.patch 0006-Do-not-use-pipenv-to-build-docs.patch +libtool.patch