[PATCH 6 of 6] debug/ltrace: Fix HOST_OS and ar

[PATCH 6 of 6] debug/ltrace: Fix HOST_OS and ar

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# 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" <crossgcc@guylhem.net>
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

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

[PATCH 1 of 6] configure: fix --with-prog=[...]

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# Date 1313998895 -7200
# Node ID b1be254591e7b524a0b06a2247a9331ebe0faf1d
# Parent  e4a6fefcb0f5ecbcade3ae5edbe609560843aed1
configure: fix --with-prog=[...]

check_for didn't set variable 'where' when the path to a prog
was passed manually "(cached)".

Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

diff -r e4a6fefcb0f5 -r b1be254591e7 configure
--- a/configure	Sun Aug 21 17:54:12 2011 +0200
+++ b/configure	Mon Aug 22 09:41:35 2011 +0200
@@ -183,6 +183,7 @@
                 eval val="\${${var}}"
                 if [ -n "${val}" ]; then
                     status="${val} (cached)\n"
+                    where="${val}"
                     break
                 fi
             fi

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 2 of 6] configure: require libtoolize, create wrapper to it

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# Date 1313998831 -7200
# Node ID f9bee81aabe252b001ff70d40c0c061811011c05
# Parent  b1be254591e7b524a0b06a2247a9331ebe0faf1d
configure: require libtoolize, create wrapper to it

libtoolize must be checked_for and there needs to be a wrapper
that points to GNU libtoolize since that may be installed
as glibtoolize.
This fixes a problem with building Cloog/PPL that was

Reported-by: "Pierrick Brossin"
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

diff -r b1be254591e7 -r f9bee81aabe2 Makefile.in
--- a/Makefile.in	Mon Aug 22 09:41:35 2011 +0200
+++ b/Makefile.in	Mon Aug 22 09:40:31 2011 +0200
@@ -50,16 +50,17 @@
 LOCAL  := @@LOCAL@@
 
 # Paths found by ./configure
-install:= @@install@@
-bash   := @@bash@@
-grep   := @@grep@@
-make   := @@make@@
-sed    := @@sed@@
-libtool:= @@libtool@@
-objcopy:= @@objcopy@@
-objdump:= @@objdump@@
-readelf:= @@readelf@@
-patch  := @@patch@@
+install   := @@install@@
+bash      := @@bash@@
+grep      := @@grep@@
+make      := @@make@@
+sed       := @@sed@@
+libtool   := @@libtool@@
+libtoolize:= @@libtoolize@@
+objcopy   := @@objcopy@@
+objdump   := @@objdump@@
+readelf   := @@readelf@@
+patch     := @@patch@@
 
 # config options to push down to kconfig
 KCONFIG:= @@KCONFIG@@
@@ -183,6 +184,7 @@
 	  echo "export make=$(make)";       \
 	  echo "export sed=$(sed)";         \
 	  echo "export libtool=$(libtool)"; \
+	  echo "export libtoolize=$(libtoolize)"; \
 	  echo "export objcopy=$(objcopy)"; \
 	  echo "export objdump=$(objdump)"; \
 	  echo "export readelf=$(readelf)"; \
diff -r b1be254591e7 -r f9bee81aabe2 configure
--- a/configure	Mon Aug 22 09:41:35 2011 +0200
+++ b/configure	Mon Aug 22 09:40:31 2011 +0200
@@ -491,6 +491,10 @@
              var=libtool                                                                            \
              ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
              err="'libtool' 1.5.26 or above was not found"
+has_or_abort prog=libtoolize                                                                        \
+             var=libtoolize                                                                         \
+             ver='\(GNU libtool.*\) (2[[:digit:]]*\.|1\.6[[:digit:]]*\.|1\.5\.[2-9][[:digit:]]+)'   \
+             err="'libtoolize' 1.5.26 or above was not found"
 has_or_abort prog=stat
 has_or_abort prog="curl wget"
 has_or_abort prog=patch
diff -r b1be254591e7 -r f9bee81aabe2 docs/C - Misc. tutorials.txt
--- a/docs/C - Misc. tutorials.txt	Mon Aug 22 09:41:35 2011 +0200
+++ b/docs/C - Misc. tutorials.txt	Mon Aug 22 09:40:31 2011 +0200
@@ -71,11 +71,12 @@
 
 4) run ct-ng's configure with the following tool configuration
    (assuming you have installed the tools via macports in /opt/local):
-   ./configure --with-sed=/opt/local/bin/gsed           \
-               --with-libtool=/opt/local/bin/glibtool   \
-               --with-objcopy=/opt/local/bin/gobjcopy   \
-               --with-objdump=/opt/local/bin/gobjdump   \
-               --with-readelf=/opt/local/bin/greadelf   \
+   ./configure --with-sed=/opt/local/bin/gsed                 \
+               --with-libtool=/opt/local/bin/glibtool         \
+               --with-libtoolize=/opt/local/bin/glibtoolize   \
+               --with-objcopy=/opt/local/bin/gobjcopy         \
+               --with-objdump=/opt/local/bin/gobjdump         \
+               --with-readelf=/opt/local/bin/greadelf         \
                [...other configure parameters as you like...]
 
 5) proceed as described in standard documentation

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 0 of 6] reworked patch series

[Titus von Boxberg]

Yann,

here's the reworked patch series.

Regards
Titus

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 5 of 6] debug/gdb: correct compilation error when stpcpy is a define

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# Date 1313998529 -7200
# Node ID 9c3b8e40d77c0aee9f80a19af6593fea6afd19a9
# Parent  bd1c80d7592bee149d1770ba0b5b6add79535e5f
debug/gdb: correct compilation error when stpcpy is a define

On OSX stpcpy is a define which is not recognized by gdb's configure.
This results in a compilation error.

Reported-by: "Guylhem Aznar" <crossgcc@guylhem.net>
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

diff -r bd1c80d7592b -r 9c3b8e40d77c patches/gdb/6.8/150-handle-stpcpy-define.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdb/6.8/150-handle-stpcpy-define.patch	Mon Aug 22 09:35:29 2011 +0200
@@ -0,0 +1,12 @@
+diff -ru gdb-6.8.orig/bfd/sysdep.h gdb-6.8/bfd/sysdep.h
+--- gdb-6.8.orig/bfd/sysdep.h	2007-07-03 16:26:42.000000000 +0200
++++ gdb-6.8/bfd/sysdep.h	2011-08-21 13:33:47.000000000 +0200
+@@ -131,7 +131,7 @@
+ extern PTR realloc ();
+ #endif
+ 
+-#if !HAVE_DECL_STPCPY
++#if !HAVE_DECL_STPCPY && !defined(stpcpy)
+ extern char *stpcpy (char *__dest, const char *__src);
+ #endif
+ 

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 3 of 6] libc/uClibc: portability fixes to install_headers

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# Date 1313998699 -7200
# Node ID 970b50d32f41ba8885c196f7566de4ed9ba0ee37
# Parent  f9bee81aabe252b001ff70d40c0c061811011c05
libc/uClibc: portability fixes to install_headers

Add patch files for uClibc-0.9.30:
extra/scripts/install_headers.sh: find must be called with path.
extra/scripts/unifdef.c: getline is declared in <stdio.h>, use different name.

Reported-by: "Guylhem Aznar" <crossgcc@guylhem.net>
Reported-by: "Titus von Boxberg" <titus@v9g.de>
Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

diff -r f9bee81aabe2 -r 970b50d32f41 patches/uClibc/0.9.30/200-getline-already-declared.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/uClibc/0.9.30/200-getline-already-declared.patch	Mon Aug 22 09:38:19 2011 +0200
@@ -0,0 +1,29 @@
+--- uClibc-0.9.30.orig/extra/scripts/unifdef.c	2008-04-28 01:10:00.000000000 +0200
++++ uClibc-0.9.30/extra/scripts/unifdef.c	2011-08-21 09:42:21.000000000 +0200
+@@ -206,7 +206,7 @@
+ static void             error(const char *);
+ static int              findsym(const char *);
+ static void             flushline(bool);
+-static Linetype         getline(void);
++static Linetype         getlinetype(void);
+ static Linetype         ifeval(const char **);
+ static void             ignoreoff(void);
+ static void             ignoreon(void);
+@@ -512,7 +512,7 @@
+ 
+ 	for (;;) {
+ 		linenum++;
+-		lineval = getline();
++		lineval = getlinetype();
+ 		trans_table[ifstate[depth]][lineval]();
+ 		debug("process %s -> %s depth %d",
+ 		    linetype_name[lineval],
+@@ -526,7 +526,7 @@
+  * help from skipcomment().
+  */
+ static Linetype
+-getline(void)
++getlinetype(void)
+ {
+ 	const char *cp;
+ 	int cursym;
diff -r f9bee81aabe2 -r 970b50d32f41 patches/uClibc/0.9.30/210-find-portable.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/uClibc/0.9.30/210-find-portable.patch	Mon Aug 22 09:38:19 2011 +0200
@@ -0,0 +1,11 @@
+--- uClibc-0.9.30.orig/extra/scripts/install_headers.sh	2008-10-10 15:50:38.000000000 +0200
++++ uClibc-0.9.30/extra/scripts/install_headers.sh	2011-08-21 09:49:03.000000000 +0200
+@@ -33,7 +33,7 @@
+ (
+ # We must cd, or else we'll prepend "$1" to filenames!
+ cd "$1" || exit 1
+-find ! -name '.' -a ! -path '*/.*' | sed -e 's/^\.\///' -e '/^config\//d' \
++find . ! -name '.' -a ! -path '*/.*' | sed -e 's/^\.\///' -e '/^config\//d' \
+ 	-e '/^config$/d'
+ ) | \
+ (

--
For unsubscribe information see http://sourceware.org/lists.html#faq

[PATCH 4 of 6] docs: Document usage with Xcode 4.1

[Titus von Boxberg]

# HG changeset patch
# User Titus von Boxberg <titus@v9g.de>
# Date 1313998590 -7200
# Node ID bd1c80d7592bee149d1770ba0b5b6add79535e5f
# Parent  970b50d32f41ba8885c196f7566de4ed9ba0ee37
docs: Document usage with Xcode 4.1

With Xcode 4.1 'gcc' is symlinked llvm-gcc-4.2 which cannot bootstrap
other gccs.
See http://llvm.org/bugs/show_bug.cgi?id=9571

On my machine the faulty gcc is
gcc version 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)

Document a workaround.

Signed-off-by: "Titus von Boxberg" <titus@v9g.de>

diff -r 970b50d32f41 -r bd1c80d7592b docs/C - Misc. tutorials.txt
--- a/docs/C - Misc. tutorials.txt	Mon Aug 22 09:38:19 2011 +0200
+++ b/docs/C - Misc. tutorials.txt	Mon Aug 22 09:36:30 2011 +0200
@@ -55,7 +55,7 @@
    mount somewhere.
 
 2) Install macports (or similar easy means of installing 3rd party software),
-   make sure that macport's bin dir is in your PATH.
+   make sure that macport's bin dir is in the front (!) of your PATH.
    Furtheron assuming it is /opt/local/bin.
 
 3) Install (at least) the following macports
@@ -65,11 +65,25 @@
    gsed
    gawk
    gcc43 (only necessary for Leopard OSX 10.5)
+   gcc_select (only necessary for OSX 10.5, or Xcode > 4)
 
+4) Prerequisites
    On Leopard, make sure that the macport's gcc is called with the default
-   commands (gcc, g++,...), e.g. via macport gcc_select
+   commands (gcc, g++,...), via macport's gcc_select
 
-4) run ct-ng's configure with the following tool configuration
+   On OSX 10.7 Lion / when using Xcode >= 4 make sure that the default commands
+   (gcc, g++, etc.) point to gcc-4.2, NOT llvm-gcc-4.2
+   by using macport's gcc_select feature. With MacPorts >= 1.9.2
+   the command is: "sudo port select --set gcc gcc42"
+   This also requires (like written above) that macport's bin dir
+   comes before standard directories in your PATH environment variable
+   because the gcc symlink is installed in /opt/local/bin and the default /usr/bin/gcc
+   is not removed by the gcc select command!
+   Explanation: llvm-gcc-4.2 (with Xcode 4.1 it is on my machine
+   "gcc version 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)")
+   cannot boostrap gcc. See http://llvm.org/bugs/show_bug.cgi?id=9571
+
+5) run ct-ng's configure with the following tool configuration
    (assuming you have installed the tools via macports in /opt/local):
    ./configure --with-sed=/opt/local/bin/gsed                 \
                --with-libtool=/opt/local/bin/glibtool         \
@@ -79,7 +93,7 @@
                --with-readelf=/opt/local/bin/greadelf         \
                [...other configure parameters as you like...]
 
-5) proceed as described in standard documentation
+6) proceed as described in standard documentation
 
 -----
 

--
For unsubscribe information see http://sourceware.org/lists.html#faq

Re: [PATCH 0 of 6] reworked patch series

[Yann E. MORIN]

Titus, All,

On Monday 22 August 2011 09:47:42 Titus von Boxberg wrote:
> here's the reworked patch series.

All 6 pushed as:
 - patch 1/6  #b1be254591e7
 - patch 2/6  #c7c9e98d36d8
 - patch 3/6  #b745004e1d29
 - patch 4/6  #a4f56e266879
 - patch 5/6  #8cadd5a4c611
 - patch 6/6  #f86af11138ea

Thank you!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

--
For unsubscribe information see http://sourceware.org/lists.html#faq