debug/ltrace: Fix HOST_OS and ar 1.12
authorTitus von Boxberg <titus@v9g.de>
Mon Aug 22 09:26:02 2011 +0200 (2011-08-22)
branch1.12
changeset 2640e40c55e445b8
parent 2639 c87df1f5330c
child 2641 60c322256b08
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)
patches/ltrace/0.5.3/180-libltrace-genindex.patch
patches/ltrace/0.5.3/190-ar-configurable.patch
patches/ltrace/0.5.3/200-configure-hostos.patch
scripts/build/debug/400-ltrace.sh
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/ltrace/0.5.3/180-libltrace-genindex.patch	Mon Aug 22 09:26:02 2011 +0200
     1.3 @@ -0,0 +1,12 @@
     1.4 +diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
     1.5 +--- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
     1.6 ++++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
     1.7 +@@ -39,7 +40,7 @@
     1.8 + 		$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
     1.9 + 
    1.10 + libltrace.a: 	sysdeps/sysdep.o $(OBJ)
    1.11 +-		$(AR) rcv $@ $^
    1.12 ++		$(AR) rscv $@ $^
    1.13 + 
    1.14 + $(OBJ):		sysdeps/sysdep.o
    1.15 + 
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/patches/ltrace/0.5.3/190-ar-configurable.patch	Mon Aug 22 09:26:02 2011 +0200
     2.3 @@ -0,0 +1,24 @@
     2.4 +diff -ru ltrace-0.5.3.org/Makefile.in ltrace-0.5.3/Makefile.in
     2.5 +--- ltrace-0.5.3.org/Makefile.in	2011-08-21 18:55:15.000000000 +0200
     2.6 ++++ ltrace-0.5.3/Makefile.in	2011-08-21 18:40:53.000000000 +0200
     2.7 +@@ -15,6 +15,7 @@
     2.8 + mandir		= @mandir@
     2.9 + docdir		= $(prefix)/share/doc/ltrace
    2.10 + 
    2.11 ++AR		=	@AR@
    2.12 + CC		=	@CC@
    2.13 + CFLAGS		=	-Wall @CFLAGS@
    2.14 + CPPFLAGS	=	-iquote $(TOPDIR) -iquote $(TOPDIR)/sysdeps/$(OS) -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@
    2.15 +
    2.16 +diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
    2.17 +--- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
    2.18 ++++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
    2.19 +@@ -113,7 +117,7 @@
    2.20 + #
    2.21 + # Makefile.in -> Makefile
    2.22 + #
    2.23 +-x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
    2.24 ++x_subst_vars='PACKAGE_VERSION HOST HOST_OS INSTALL AR CC CPPFLAGS CFLAGS LDFLAGS LIBS iquote iquoteend prefix sysconfdir mandir docdir'
    2.25 + 
    2.26 + for i in $x_subst_vars
    2.27 + do
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/patches/ltrace/0.5.3/200-configure-hostos.patch	Mon Aug 22 09:26:02 2011 +0200
     3.3 @@ -0,0 +1,18 @@
     3.4 +diff -ru ltrace-0.5.3.org/configure ltrace-0.5.3/configure
     3.5 +--- ltrace-0.5.3.org/configure	2011-08-21 18:55:15.000000000 +0200
     3.6 ++++ ltrace-0.5.3/configure	2011-08-21 18:54:46.000000000 +0200
     3.7 +@@ -15,8 +15,12 @@
     3.8 + echo $PACKAGE_VERSION
     3.9 + 
    3.10 + echo -n "checking HOST_OS... "
    3.11 +-HOST_OS=$( uname -s )
    3.12 +-if [ "$HOST_OS" = "Linux" ]
    3.13 ++if [ -z "$HOST_OS" ] ; then
    3.14 ++  HOST_OS=$( uname -s )
    3.15 ++else
    3.16 ++  echo -n "using preset: "
    3.17 ++fi
    3.18 ++if [ "$HOST_OS" = "Linux" -o "$HOST_OS" = "linux" ]
    3.19 + then
    3.20 +   HOST_OS="linux-gnu"
    3.21 + fi
     4.1 --- a/scripts/build/debug/400-ltrace.sh	Mon Aug 22 09:35:29 2011 +0200
     4.2 +++ b/scripts/build/debug/400-ltrace.sh	Mon Aug 22 09:26:02 2011 +0200
     4.3 @@ -38,7 +38,9 @@
     4.4          esac
     4.5          CT_DoExecLog CFG                \
     4.6          CC="${CT_TARGET}-${CT_CC}"      \
     4.7 +        AR="${CT_TARGET}-ar"            \
     4.8          HOST="${ltrace_host}"           \
     4.9 +        HOST_OS="${CT_TARGET_KERNEL}"   \
    4.10          CFLAGS="${CT_TARGET_CFLAGS}"    \
    4.11          ./configure --prefix=/usr
    4.12      else