36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From: Simon McVittie <smcv@debian.org>
|
|
Date: Sun, 26 Jun 2016 13:56:05 +0100
|
|
Subject: tests: use our own generated libtool, not the one in $PATH
|
|
|
|
libtoolize creates a version of libtool for the right architecture
|
|
in $(top_builddir), which is guaranteed to be present, and is
|
|
guaranteed to match what we are compiling (even during
|
|
cross-compilation).
|
|
|
|
Packaging systems sometimes separate /usr/bin/libtool, which is
|
|
specific to one architecture, from the libtool development files
|
|
such as libtoolize and ltmain.sh, which are architecture-independent.
|
|
For example, in Debian, libtool_*_all.deb contains the files necessary
|
|
to libtoolize a package and is depended on by the dh-autoreconf package,
|
|
but libtool-bin_*_amd64.deb (or whatever architecture) contains
|
|
/usr/bin/libtool and is not normally necessary to depend on.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
|
---
|
|
Makefile-tests.am | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile-tests.am b/Makefile-tests.am
|
|
index 8090307..25b8202 100644
|
|
--- a/Makefile-tests.am
|
|
+++ b/Makefile-tests.am
|
|
@@ -245,7 +245,7 @@ ALL_LOCAL_RULES += tests/libreaddir-rand.so
|
|
CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree
|
|
|
|
tests/ostree-symlink-stamp: Makefile
|
|
- @real_bin=`cd $(top_builddir) && libtool --mode=execute echo ostree`; \
|
|
+ @real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
|
|
ln -sf "$${real_bin}" tests/ostree; \
|
|
touch $@
|
|
|