diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
| commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
| tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/glibc/files | |
| parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
| download | openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.bz2 openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.xz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.zip | |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/glibc/files')
| -rw-r--r-- | openembedded/packages/glibc/files/5090_all_stubs-rule-fix.patch | 39 | ||||
| -rw-r--r-- | openembedded/packages/glibc/files/etc/ld.so.conf | 2 |
2 files changed, 40 insertions, 1 deletions
diff --git a/openembedded/packages/glibc/files/5090_all_stubs-rule-fix.patch b/openembedded/packages/glibc/files/5090_all_stubs-rule-fix.patch new file mode 100644 index 000000000..c445a5296 --- /dev/null +++ b/openembedded/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/openembedded/packages/glibc/files/etc/ld.so.conf b/openembedded/packages/glibc/files/etc/ld.so.conf index 3f9b41aab..fb1aab516 100644 --- a/openembedded/packages/glibc/files/etc/ld.so.conf +++ b/openembedded/packages/glibc/files/etc/ld.so.conf @@ -1,3 +1,3 @@ /usr/local/lib /opt/QtPalmtop/lib - +/usr/X11R6/lib |