diff options
| author | Titus von Boxberg" <titus@v9g.de> | 2011-08-22 09:26:02 +0200 |
|---|---|---|
| committer | Titus von Boxberg <titus@v9g.de> | 2011-08-22 09:26:02 +0200 |
| commit | 68cd6e6d26e722da97ae6e847697e4cb58b66ac1 (patch) | |
| tree | 1782248ffeb4ba81cba0b0da168344563ef76696 /patches | |
| parent | 711ac75ad0dbbf8e1dbc3a95f82df7a36505b7d2 (diff) | |
| download | crosstool-ng-68cd6e6d26e722da97ae6e847697e4cb58b66ac1.tar.gz crosstool-ng-68cd6e6d26e722da97ae6e847697e4cb58b66ac1.tar.bz2 crosstool-ng-68cd6e6d26e722da97ae6e847697e4cb58b66ac1.zip | |
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>
Diffstat (limited to 'patches')
| -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 00000000..0b1629b6 --- /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 00000000..28856a3e --- /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 00000000..36563f44 --- /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 |