diff options
author | Titus von Boxberg <titus@v9g.de> | 2011-08-22 07:26:02 (GMT) |
---|---|---|
committer | Titus von Boxberg <titus@v9g.de> | 2011-08-22 07:26:02 (GMT) |
commit | 3bd14bf2f010ba46fe9552e29c678c32522d76f9 (patch) | |
tree | 46a56b9d71d8ef35d64658d549a8c90822d38324 /patches/ltrace/0.5.3 | |
parent | 31fb617ab28e2970d32dfc03bd096fbf563cd1f4 (diff) |
debug/ltrace: Fix HOST_OS and ar
HOST_OS really is the target OS. Allow setting it for configure
via an environment variable.
libltrace.a should have an index:
Allow ar to be set as an environment variable, and generate
an index in this lib.
Reported-by: "Guylhem Aznar" <crossgcc@guylhem.net>
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>
(transplanted from f86af11138ea2b2ecd4876d9c6c24f58ba4d68ac)
Diffstat (limited to 'patches/ltrace/0.5.3')
-rw-r--r-- | patches/ltrace/0.5.3/180-libltrace-genindex.patch | 12 | ||||
-rw-r--r-- | patches/ltrace/0.5.3/190-ar-configurable.patch | 24 | ||||
-rw-r--r-- | patches/ltrace/0.5.3/200-configure-hostos.patch | 18 |
3 files changed, 54 insertions, 0 deletions
diff --git a/patches/ltrace/0.5.3/180-libltrace-genindex.patch b/patches/ltrace/0.5.3/180-libltrace-genindex.patch new file mode 100644 index 0000000..0b1629b --- /dev/null +++ b/patches/ltrace/0.5.3/180-libltrace-genindex.patch @@ -0,0 +1,12 @@ +diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in +--- ltrace-0.5.3.org/Makefile.in 2011-08-21 18:55:15.000000000 +0200 ++++ ltrace-0.5.3/Makefile.in 2011-08-21 18:40:53.000000000 +0200 +@@ -39,7 +40,7 @@ + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + + libltrace.a: sysdeps/sysdep.o $(OBJ) +- $(AR) rcv $@ $^ ++ $(AR) rscv $@ $^ + + $(OBJ): sysdeps/sysdep.o + diff --git a/patches/ltrace/0.5.3/190-ar-configurable.patch b/patches/ltrace/0.5.3/190-ar-configurable.patch new file mode 100644 index 0000000..28856a3 --- /dev/null +++ b/patches/ltrace/0.5.3/190-ar-configurable.patch @@ -0,0 +1,24 @@ +diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in +--- ltrace-0.5.3.org/Makefile.in 2011-08-21 18:55:15.000000000 +0200 ++++ ltrace-0.5.3/Makefile.in 2011-08-21 18:40:53.000000000 +0200 +@@ -15,6 +15,7 @@ + mandir = @mandir@ + docdir = $(prefix)/share/doc/ltrace + ++AR = @AR@ + CC = @CC@ + CFLAGS = -Wall @CFLAGS@ + CPPFLAGS = -iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@ + +diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure +--- ltrace-0.5.3.org/configure 2011-08-21 18:55:15.000000000 +0200 ++++ ltrace-0.5.3/configure 2011-08-21 18:54:46.000000000 +0200 +@@ -113,7 +117,7 @@ + # + # Makefile.in -> Makefile + # +-x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir' ++x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL AR CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir' + + for i in $x_subst_vars + do diff --git a/patches/ltrace/0.5.3/200-configure-hostos.patch b/patches/ltrace/0.5.3/200-configure-hostos.patch new file mode 100644 index 0000000..36563f4 --- /dev/null +++ b/patches/ltrace/0.5.3/200-configure-hostos.patch @@ -0,0 +1,18 @@ +diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure +--- ltrace-0.5.3.org/configure 2011-08-21 18:55:15.000000000 +0200 ++++ ltrace-0.5.3/configure 2011-08-21 18:54:46.000000000 +0200 +@@ -15,8 +15,12 @@ + echo $PACKAGE_VERSION + + echo -n "checking HOST_OS... " +-HOST_OS=$( uname -s ) +-if [ "$HOST_OS" = "Linux" ] ++if [ -z "$HOST_OS" ] ; then ++ HOST_OS=$( uname -s ) ++else ++ echo -n "using preset: " ++fi ++if [ "$HOST_OS" = "Linux" -o "$HOST_OS" = "linux" ] + then + HOST_OS="linux-gnu" + fi |