ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-20 05:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debug/ltrace: Fix HOST_OS and ar

Browse Source 
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>
This commit is contained in:
Titus von Boxberg" 2011-08-22 09:26:02 +02:00 committed by Titus von Boxberg
parent 711ac75ad0
commit 68cd6e6d26
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/ltrace/0.5.3/180-libltrace-genindex.patch Normal file
View File

@ -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

24
patches/ltrace/0.5.3/190-ar-configurable.patch Normal file
View File

@ -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

18
patches/ltrace/0.5.3/200-configure-hostos.patch Normal file
View File

@ -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

2
scripts/build/debug/400-ltrace.sh
View File

@ -38,7 +38,9 @@ do_debug_ltrace_build() {
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