summaryrefslogtreecommitdiff
path: root/packages/glibc/files
diff options
context:
space:
mode:
authorRaymond Danks <raymond@edanks.com>2006-04-18 01:30:14 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-18 01:30:14 +0000
commit5d2e2203caf732811538b072b8d8bfd0f5ebf512 (patch)
treeb596bf3bddcf8b9020761c69d3ce9ede2c617b2c /packages/glibc/files
parentb30b0e6d917f3a3005f4b151ab5a3972d275abb9 (diff)
glibc: 5090_all_stubs-rule-fix.patch allows building from very deep
directories
Diffstat (limited to 'packages/glibc/files')
-rw-r--r--packages/glibc/files/5090_all_stubs-rule-fix.patch39
-rw-r--r--packages/glibc/files/etc/ld.so.conf2
2 files changed, 40 insertions, 1 deletions
diff --git a/packages/glibc/files/5090_all_stubs-rule-fix.patch b/packages/glibc/files/5090_all_stubs-rule-fix.patch
new file mode 100644
index 0000000000..c445a5296e
--- /dev/null
+++ b/packages/glibc/files/5090_all_stubs-rule-fix.patch
@@ -0,0 +1,39 @@
+Index: Makerules
+===================================================================
+RCS file: /cvs/glibc/libc/Makerules,v
+retrieving revision 1.430
+diff -u -r1.430 Makerules
+--- libc/Makerules 5 Mar 2005 19:24:32 -0000 1.430
++++ libc/Makerules 22 Apr 2005 18:31:27 -0000
+@@ -1390,15 +1390,26 @@
+ $(addprefix $(objpfx),$(extra-objs))
+ $(objpfx)stubs: $(objs-for-stubs)
+ ifneq (,$(strip $(objs-for-stubs)))
+- $(OBJDUMP) -h $^ | \
+- $(AWK) '/\.gnu\.glibc-stub\./ { \
+- sub(/\.gnu\.glibc-stub\./, "", $$2); \
+- stubs[$$2] = 1; } \
+- END { for (s in stubs) print "#define __stub_" s }' > $@T
++ $(stub-obj-list)
++ cat $@L | xargs \
++ $(OBJDUMP) -h | \
++ $(AWK) '/\.gnu\.glibc-stub\./ { \
++ sub(/\.gnu\.glibc-stub\./, "", $$2); \
++ stubs[$$2] = 1; } \
++ END { for (s in stubs) print "#define __stub_" s }' \
++ > $@T
++ -rm -f $@L
+ mv -f $@T $@
+ else
+ > $@
+ endif
++
++define stub-obj-list
++-@rm -f $@L
++-@echo "Generating stub obj list..."
++$(foreach file,$^,
++@echo >> $@L '$(file)')
++endef
+
+ # This information is not used for making distributions any more.
+ # But it's used by MakeTAGS for making TAGS files and the .pot files.
diff --git a/packages/glibc/files/etc/ld.so.conf b/packages/glibc/files/etc/ld.so.conf
index 3f9b41aabb..fb1aab516d 100644
--- a/packages/glibc/files/etc/ld.so.conf
+++ b/packages/glibc/files/etc/ld.so.conf
@@ -1,3 +1,3 @@
/usr/local/lib
/opt/QtPalmtop/lib
-
+/usr/X11R6/lib