From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18836 invoked by alias); 22 Aug 2011 07:49:53 -0000 Received: (qmail 18694 invoked by uid 22791); 22 Aug 2011 07:49:52 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from tschetwerikow.v9g.de (HELO tschetwerikow.v9g.de) (217.92.164.63) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 22 Aug 2011 07:49:38 +0000 Received: from localhost (localhost [127.0.0.1]) by tschetwerikow.v9g.de (Postfix) with ESMTP id C04E6175138D; Mon, 22 Aug 2011 09:49:27 +0200 (CEST) Received: from tschetwerikow.v9g.de ([127.0.0.1]) by localhost (tschetwerikow.boxberg.lan [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8PVucMcvOrJA; Mon, 22 Aug 2011 09:49:25 +0200 (CEST) Received: from mikulin.boxberg.lan (mikulin.boxberg.lan [10.0.1.253]) by tschetwerikow.v9g.de (Postfix) with ESMTPS id 57C35175133F; Mon, 22 Aug 2011 09:49:18 +0200 (CEST) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 6 of 6] debug/ltrace: Fix HOST_OS and ar X-Mercurial-Node: c0e06bc54711295d13b42f7ef949afe8aa9ce599 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/1.9 Date: Mon, 22 Aug 2011 07:49:00 -0000 From: Titus von Boxberg To: crossgcc@sourceware.org Cc: yann.morin.1998@anciens.enib.fr X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org X-SW-Source: 2011-08/txt/msg00104.txt.bz2 # HG changeset patch # User Titus von Boxberg # Date 1313997962 -7200 # Node ID c0e06bc54711295d13b42f7ef949afe8aa9ce599 # Parent 9c3b8e40d77c0aee9f80a19af6593fea6afd19a9 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" Signed-off-by: "Titus von Boxberg" diff -r 9c3b8e40d77c -r c0e06bc54711 patches/ltrace/0.5.3/180-libltrace-genindex.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ltrace/0.5.3/180-libltrace-genindex.patch Mon Aug 22 09:26:02 2011 +0200 @@ -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 -r 9c3b8e40d77c -r c0e06bc54711 patches/ltrace/0.5.3/190-ar-configurable.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ltrace/0.5.3/190-ar-configurable.patch Mon Aug 22 09:26:02 2011 +0200 @@ -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 -r 9c3b8e40d77c -r c0e06bc54711 patches/ltrace/0.5.3/200-configure-hostos.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ltrace/0.5.3/200-configure-hostos.patch Mon Aug 22 09:26:02 2011 +0200 @@ -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 diff -r 9c3b8e40d77c -r c0e06bc54711 scripts/build/debug/400-ltrace.sh --- a/scripts/build/debug/400-ltrace.sh Mon Aug 22 09:35:29 2011 +0200 +++ b/scripts/build/debug/400-ltrace.sh Mon Aug 22 09:26:02 2011 +0200 @@ -38,7 +38,9 @@ esac CT_DoExecLog CFG \ CC="${CT_TARGET}-${CT_CC}" \ + AR="${CT_TARGET}-ar" \ HOST="${ltrace_host}" \ + HOST_OS="${CT_TARGET_KERNEL}" \ CFLAGS="${CT_TARGET_CFLAGS}" \ ./configure --prefix=/usr else -- For unsubscribe information see http://sourceware.org/lists.html#faq