From 8155bbf2e249ec31d042d150c6085480b4b40324 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 4 Apr 2010 13:48:13 +0200 Subject: update to latest upstream --- toolchain/uClibc/Makefile.inc | 4 +- toolchain/uClibc/patches/devel-prefix-lib.patch | 105 +++++++++++++----------- 2 files changed, 60 insertions(+), 49 deletions(-) (limited to 'toolchain') diff --git a/toolchain/uClibc/Makefile.inc b/toolchain/uClibc/Makefile.inc index f02b99e1a..c642cc664 100644 --- a/toolchain/uClibc/Makefile.inc +++ b/toolchain/uClibc/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= uClibc -PKG_VERSION:= 0.9.30.3 +PKG_VERSION:= 0.9.31 PKG_RELEASE:= 1 -PKG_MD5SUM:= 73a4bf4a0fa508b01a7a3143574e3d21 +PKG_MD5SUM:= 52fb8a494758630c8d3ddd7f1e0daafd PKG_SITES:= http://uclibc.org/downloads/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/toolchain/uClibc/patches/devel-prefix-lib.patch b/toolchain/uClibc/patches/devel-prefix-lib.patch index 336fad1c7..ce22e539c 100644 --- a/toolchain/uClibc/patches/devel-prefix-lib.patch +++ b/toolchain/uClibc/patches/devel-prefix-lib.patch @@ -1,78 +1,89 @@ -diff -Nur uClibc-0.9.30.3.orig/Makefile.in uClibc-0.9.30.3/Makefile.in ---- uClibc-0.9.30.3.orig/Makefile.in 2010-03-12 20:32:42.000000000 +0100 -+++ uClibc-0.9.30.3/Makefile.in 2010-03-12 22:05:15.486918488 +0100 -@@ -190,7 +190,7 @@ +diff -Nur uClibc-0.9.31.orig/Makefile.in uClibc-0.9.31/Makefile.in +--- uClibc-0.9.31.orig/Makefile.in 2010-04-02 17:34:27.000000000 +0200 ++++ uClibc-0.9.31/Makefile.in 2010-04-04 10:12:15.000000000 +0200 +@@ -191,7 +191,7 @@ install: install_runtime install_dev --RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib) -+RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX_LIB)lib $(RUNTIME_PREFIX)lib) +-RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR)) ++RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX_LIB)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR)) - $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c|$(@D) - $(hcompile.u) -@@ -371,41 +371,41 @@ + $(top_builddir)extra/scripts/unifdef: |$(top_builddir)extra/scripts + $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c +@@ -302,49 +302,50 @@ + endif # Installs development library links. - install_dev: install_headers install_runtime -- $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib -- -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ -+ $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX_LIB)lib -+ -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX_LIB)lib/ +-install_dev: install_headers install_runtime | $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR) +- -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ ++install_dev: install_headers install_runtime ++ $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR) ++ -$(INSTALL) -m 644 $(top_builddir)lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/ ifeq ($(HAVE_SHARED),y) - for i in `find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ + for i in `cd $(top_builddir) && find lib/ -type l -name 'lib[a-zA-Z]*.so' | \ $(SED) -e 's/lib\///'` ; do \ $(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \ -- $(PREFIX)$(DEVEL_PREFIX)lib/$$i; \ -+ $(PREFIX)$(DEVEL_PREFIX_LIB)lib/$$i; \ +- $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/$$i; \ ++ $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/$$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):' \ -+ $(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libc.so; \ -+ $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX_LIB)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; \ -+ $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libc.so; \ + ifeq ($(HARDWIRED_ABSPATH),y) + if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME) ] ; then \ +- $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ +- $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX)$(MULTILIB_DIR)/$(NONSHARED_LIBNAME):' \ ++ $(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libc.so; \ ++ $(SED) -e 's:$(NONSHARED_LIBNAME):$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/$(NONSHARED_LIBNAME):' \ + -e 's:$(SHARED_MAJORNAME):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_MAJORNAME):' \ + -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO):' \ +- $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \ ++ $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libc.so; \ fi + else +- -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ ++ -$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/ + endif 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; \ -+ $(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \ -+ cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \ -+ echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX_LIB)lib/libpthread_nonshared.a )" \ -+ >> $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libpthread.so; \ + ifeq ($(HARDWIRED_ABSPATH),y) + if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) ] ; then \ +- $(RM) $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ +- cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ +- echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread_nonshared.a )" \ +- >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \ ++ $(RM) $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libpthread.so; \ ++ cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libpthread.so; \ ++ echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libpthread_nonshared.a )" \ ++ >> $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libpthread.so; \ fi + else +- -$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/ ++ -$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/ + endif 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 -+ $(PREFIX)$(DEVEL_PREFIX_LIB)lib/libthread_db.so +- $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libthread_db.so ++ $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/libthread_db.so endif ifeq ($(DOPIC),y) # # If we build shared libraries then the static libs are PIC... # # Make _pic.a symlinks to make mklibs.py and similar tools happy. - if [ -d lib ] ; then \ - for i in `find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ -- $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)lib/`echo $$i \ -+ $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX_LIB)lib/`echo $$i \ + if [ -d $(top_builddir)lib ] ; then \ + for i in `cd $(top_builddir) && find lib/ -type f -name 'lib*.a' | $(SED) -e 's/lib\///'` ; do \ +- $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/`echo $$i \ ++ $(LN) -sf $$i $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR)/`echo $$i \ | $(SED) -e 's/\.a$$/_pic.a/'`; \ done ; \ fi -@@ -414,9 +414,9 @@ +@@ -353,9 +354,9 @@ ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y) - for file in lib/lib*.gdb; do \ + for file in $(top_builddir)lib/lib*.gdb; do \ if test -f $$file; then \ -- $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \ -+ $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX_LIB)lib; \ +- $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR); \ ++ $(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR); \ $(INSTALL) -m 755 `echo $$file | $(SED) 's/\.gdb$$//'` \ -- $(PREFIX)$(DEVEL_PREFIX)lib; \ -+ $(PREFIX)$(DEVEL_PREFIX_LIB)lib; \ +- $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR); \ ++ $(PREFIX)$(DEVEL_PREFIX_LIB)$(MULTILIB_DIR); \ fi; \ done endif -- cgit v1.2.3