diff options
| author | Harlan Lieberman-Berg <hlieberman@debian.org> | 2018-11-04 21:34:10 +0800 |
|---|---|---|
| committer | Paul Gevers <elbrus@debian.org> | 2020-12-10 09:24:21 +0100 |
| commit | 75c334b70b4a10c95473ae996dbbe401bbf2b032 (patch) | |
| tree | 4f6b19e69ef9aa222dece1190bee3dc3d6dbeadb | |
| parent | 54c54430795403cfd2d85adbc3d3c492a04577cb (diff) | |
Ensure jq doesn't statically link in libraries
Forwarded: not-needed
Gbp-Pq: Name disable-static-libtool.patch
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | tests/setup | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index cd16690..13f74c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ src/builtin.o: src/builtin.inc bin_PROGRAMS = jq jq_SOURCES = src/main.c src/version.h -jq_LDFLAGS = -static-libtool-libs jq_LDADD = libjq.la -lm if WIN32 @@ -114,7 +113,7 @@ jq_LDADD += -lshlwapi endif if ENABLE_ALL_STATIC -jq_LDFLAGS += -all-static +jq_LDFLAGS = -all-static endif ### Tests (make check) diff --git a/tests/setup b/tests/setup index 4a96574..4d5f0c4 100755 --- a/tests/setup +++ b/tests/setup @@ -13,8 +13,9 @@ JQBASEDIR=$JQTESTDIR/.. JQ=$JQBASEDIR/jq if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then - VALGRIND="valgrind --error-exitcode=1 --leak-check=full \ - --suppressions=$JQTESTDIR/onig.supp" + VALGRIND="libtool --mode=execute -- valgrind \ + --error-exitcode=1 --leak-check=full \ + --suppressions=$JQTESTDIR/onig.supp" VG_EXIT0=--error-exitcode=0 Q=-q else |