Author: qboosh Date: Sun Aug 28 08:32:24 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add runtime lib dir to -rpath-link/-rpath (to catch ld-uClibc.so)
---- Files affected:
SOURCES:
uClibc-toolchain-wrapper.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/uClibc-toolchain-wrapper.patch
diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.3
SOURCES/uClibc-toolchain-wrapper.patch:1.4
--- SOURCES/uClibc-toolchain-wrapper.patch:1.3 Sat Jan 15 23:36:50 2005
+++ SOURCES/uClibc-toolchain-wrapper.patch Sun Aug 28 10:32:19 2005
@@ -1,7 +1,7 @@
diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c
uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c
--- uClibc-0.9.26.org/extra/gcc-uClibc/gcc-uClibc.c 1970-01-01
01:00:00.000000000 +0100
+++ uClibc-0.9.26/extra/gcc-uClibc/gcc-uClibc.c 2003-08-28
07:51:04.000000000 +0200
-@@ -0,0 +1,660 @@
+@@ -0,0 +1,666 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Copyright (C) 2000 Manuel Novoa III
@@ -190,6 +190,7 @@
+ char *dlstr;
+ char *incstr;
+ char *devprefix;
++ char *runprefix;
+ char *builddir;
+ char *libstr;
+ char *build_dlstr = 0;
@@ -253,6 +254,11 @@
+ devprefix = UCLIBC_DEVEL_PREFIX;
+ }
+
++ runprefix = getenv("UCLIBC_RUNTIME_PREFIX");
++ if (!runprefix) {
++ runprefix = UCLIBC_RUNTIME_PREFIX;
++ }
++
+ builddir = getenv("UCLIBC_BUILD_DIR");
+ if (!builddir) {
+ builddir = UCLIBC_BUILD_DIR;
@@ -275,10 +281,10 @@
+ }
+
+
-+ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib", NULL);
++ xstrcat(&(rpath_link[0]), "-Wl,-rpath-link,", devprefix, "/lib:",
runprefix, "/lib", NULL);
+ xstrcat(&(rpath_link[1]), "-Wl,-rpath-link,", builddir, "/lib", NULL);
+
-+ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib", NULL);
++ xstrcat(&(rpath[0]), "-Wl,-rpath,", devprefix, "/lib:", runprefix,
"/lib", NULL);
+ xstrcat(&(rpath[1]), "-Wl,-rpath,", builddir, "/lib", NULL);
+
+ xstrcat(&(uClibc_inc[0]), devprefix, "/include/", NULL);
@@ -665,7 +671,7 @@
diff -urN uClibc-0.9.26.org/extra/gcc-uClibc/Makefile
uClibc-0.9.26/extra/gcc-uClibc/Makefile
--- uClibc-0.9.26.org/extra/gcc-uClibc/Makefile 1970-01-01
01:00:00.000000000 +0100
+++ uClibc-0.9.26/extra/gcc-uClibc/Makefile 2004-01-25 16:06:22.372828491
+0100
-@@ -0,0 +1,92 @@
+@@ -0,0 +1,93 @@
+# Makefile for building a fake gcc/binutils toolchain
+# that simply spoofs the location of the C library
+#
@@ -686,6 +692,7 @@
+ @echo "/* this file was autogenerated by make */" > gcc-uClibc.h
+ @echo "#define UCLIBC_TARGET_PREFIX " \"$(TARGET_PREFIX)\" >>
gcc-uClibc.h
+ @echo "#define UCLIBC_DEVEL_PREFIX " \"$(DEVEL_PREFIX)\" >> gcc-uClibc.h
++ @echo "#define UCLIBC_RUNTIME_PREFIX " \"$(RUNTIME_PREFIX)\" >>
gcc-uClibc.h
+ @echo "#define UCLIBC_BUILD_DIR " \"$(UCLIBC_DIR)\" >> gcc-uClibc.h
+ @echo "#define GCC_BIN " \"$(GCC_BIN)\" >> gcc-uClibc.h
+ @echo "#define LIBGCC_DIR " \"$(LIBGCC_DIR)\" >> gcc-uClibc.h
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
