# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1167276760 18000
# Node ID 57f77c25b39deef9f1d75c2502d70c444b41d0c9
# Parent  79295919b775e4c4e1364fcdd206f3c4dccbd3c2
Hit uClibc build with a large rock so it stops inserting hardwired paths in
libc.so linker script.  Add strace to download list because it's likely to
come in handy soon.

diff -r 79295919b775 -r 57f77c25b39d cross-compiler.sh
--- a/cross-compiler.sh	Tue Dec 26 01:20:11 2006 -0500
+++ b/cross-compiler.sh	Wed Dec 27 22:32:40 2006 -0500
@@ -69,9 +69,8 @@
 setupfor uClibc
 cp "${WORK}"/config-uClibc .config &&
 (yes "" | make CROSS="${ARCH}-" oldconfig) > /dev/null &&
-make CROSS="${ARCH}-" KERNEL_HEADERS="${CROSS}/include" \
-	RUNTIME_PREFIX="${CROSS}/" DEVEL_PREFIX="${CROSS}/" \
-	all install_runtime install_dev &&
+make CROSS="${ARCH}-" KERNEL_HEADERS="${CROSS}/include" PREFIX="${CROSS}/" \
+	RUNTIME_PREFIX=/ DEVEL_PREFIX=/ all install_runtime install_dev &&
 # This needs to be built with the native compiler.  Since uClibc uses $CROSS
 # internally, we have to blank it to avoid confusing them.
 #CROSS= make KERNEL_HEADERS="${CROSS}/include" \
diff -r 79295919b775 -r 57f77c25b39d download.sh
--- a/download.sh	Tue Dec 26 01:20:11 2006 -0500
+++ b/download.sh	Wed Dec 27 22:32:40 2006 -0500
@@ -56,6 +56,11 @@
 SHA1=b3e158877f94e66ec1c8ef604e994851ee388b09 \
 download &&
 
+URL=http://superb-east.dl.sourceforge.net/sourceforge/strace/strace-4.5.14.tar.bz2 \
+SHA1= \
+download &&
+
+
 echo === Got all source. &&
 
 cleanup_oldfiles
diff -r 79295919b775 -r 57f77c25b39d mini-native.sh
--- a/mini-native.sh	Tue Dec 26 01:20:11 2006 -0500
+++ b/mini-native.sh	Wed Dec 27 22:32:40 2006 -0500
@@ -8,6 +8,7 @@
 
 # Tell the wrapper script where to find the dynamic linker.
 export UCLIBC_DYNAMIC_LINKER=/tools/lib/ld-uClibc.so.0
+export UCLIBC_RPATH=/tools/lib
 
 # Purple.  And why not?
 echo -e "\e[35m"
@@ -33,8 +34,8 @@
 setupfor uClibc
 cp "${WORK}"/config-uClibc .config &&
 (yes "" | make CROSS="${ARCH}-" oldconfig) > /dev/null &&
-make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" \
-        RUNTIME_PREFIX="${TOOLS}/" DEVEL_PREFIX="${TOOLS}/" \
+make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" PREFIX="${NATIVE}/" \
+        RUNTIME_PREFIX=/tools/ DEVEL_PREFIX=/tools/ \
         all install_runtime install_dev install_utils &&
 cd .. &&
 $CLEANUP uClibc*
@@ -139,6 +140,7 @@
 ac_cv_func_setvbuf_reversed=no
 bash_cv_sys_named_pipes=yes
 bash_cv_have_mbstate_t=yes
+bash_cv_getenv_redef=no
 EOF
 CC="${ARCH}-gcc" ./configure --prefix="${TOOLS}" --build="${CROSS_HOST}" \
   --host="${CROSS_TARGET}" --cache-file=config.cache \
diff -r 79295919b775 -r 57f77c25b39d sources/patches/uClibc-install.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sources/patches/uClibc-install.patch	Wed Dec 27 22:32:40 2006 -0500
@@ -0,0 +1,26 @@
+--- uClibc/Makefile.in	2006-12-14 21:13:04.000000000 -0500
++++ uClibc-new/Makefile.in	2006-12-27 19:20:35.000000000 -0500
+@@ -207,23 +207,6 @@
+ 		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
+ 		$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
+ 	done
+-	if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME) ] ; then \
+-		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+-		sed -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)lib/$(NONSHARED_LIBNAME):' \
+-		    -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)lib/$(SHARED_MAJORNAME):' \
+-		    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
+-		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
+-	fi
+-ifeq ($(UCLIBC_HAS_THREADS),y)
+-ifneq ($(LINUXTHREADS_OLD),y)
+-	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
+-		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+-		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+-		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
+-			>> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
+-	fi
+-endif
+-endif
+ ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+ 	$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
+ 		$(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so