SOURCES: uClibc-debug.patch, uClibc-newsoname.patch, uClibc-toolchain-wrapp...

qboosh qboosh at pld-linux.org
Sat Jan 10 19:52:06 CET 2009


Author: qboosh                       Date: Sat Jan 10 18:52:06 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.9.30

---- Files affected:
SOURCES:
   uClibc-debug.patch (1.1 -> 1.2) , uClibc-newsoname.patch (1.4 -> 1.5) , uClibc-toolchain-wrapper.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/uClibc-debug.patch
diff -u SOURCES/uClibc-debug.patch:1.1 SOURCES/uClibc-debug.patch:1.2
--- SOURCES/uClibc-debug.patch:1.1	Sat May 12 14:38:57 2007
+++ SOURCES/uClibc-debug.patch	Sat Jan 10 19:52:00 2009
@@ -1,9 +1,9 @@
---- uClibc-0.9.29/Rules.mak.orig	2007-04-17 13:34:11.000000000 +0000
-+++ uClibc-0.9.29/Rules.mak	2007-05-12 12:27:50.000000000 +0000
-@@ -410,7 +410,7 @@
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -z defs
+--- uClibc-0.9.30/Rules.mak.orig	2008-11-12 13:24:16.000000000 +0100
++++ uClibc-0.9.30/Rules.mak	2009-01-10 11:52:34.766458047 +0100
+@@ -528,7 +528,7 @@
+ 
+ LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
  ifeq ($(DODEBUG),y)
- #CFLAGS += -g3
 -CFLAGS += -O0 -g3
 +CFLAGS += $(OPTIMIZATION) -O0 -g3
  else

================================================================
Index: SOURCES/uClibc-newsoname.patch
diff -u SOURCES/uClibc-newsoname.patch:1.4 SOURCES/uClibc-newsoname.patch:1.5
--- SOURCES/uClibc-newsoname.patch:1.4	Sat May 12 13:27:42 2007
+++ SOURCES/uClibc-newsoname.patch	Sat Jan 10 19:52:00 2009
@@ -1,11 +1,11 @@
---- uClibc-0.9.29/libpthread/linuxthreads.old/Makefile.in.orig	2007-03-19 10:49:04.000000000 +0100
-+++ uClibc-0.9.29/libpthread/linuxthreads.old/Makefile.in	2007-05-12 12:00:56.716329632 +0200
+--- uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in.orig	2008-11-07 22:15:53.000000000 +0100
++++ uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in	2009-01-10 11:36:18.378455532 +0100
 @@ -12,15 +12,15 @@
  CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old)
  
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
--LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
-+LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -z defs
+-LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
++LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
  else
 -LDFLAGS-libpthread.so := $(LDFLAGS)
 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
@@ -21,23 +21,20 @@
  
  libpthread_FULL_NAME := libpthread-$(VERSION).so
  
-@@ -70,19 +70,23 @@
+@@ -70,16 +70,20 @@
  libpthread-so-y += $(libpthread_OBJ:.o=.os) $(libpthread-shared-y)
  
  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
 -lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
 +lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so
- objclean-y += libpthread_clean
- headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
- headers_clean-y += linuxthreads_headers_clean
  
  #ifeq ($(DOMULTI),n)
--$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
-+$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc)
+-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
++$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
  	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  #else
--#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
-+#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc)
+-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
++#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
  #	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  #endif
  
@@ -45,17 +42,17 @@
 +	$(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
 +	$(LN) -sf $(notdir $<) $@
 +
- $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
- 	$(Q)$(RM) $@
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
---- uClibc-0.9.29/libpthread/linuxthreads/Makefile.in.orig	2007-03-19 10:49:04.000000000 +0100
-+++ uClibc-0.9.29/libpthread/linuxthreads/Makefile.in	2007-05-12 11:56:54.194509100 +0200
+ $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+ endif
+--- uClibc-0.9.30/libpthread/linuxthreads/Makefile.in.orig	2008-11-07 22:15:53.000000000 +0100
++++ uClibc-0.9.30/libpthread/linuxthreads/Makefile.in	2009-01-10 11:38:44.322453856 +0100
 @@ -19,15 +19,15 @@
  #CFLAGS:=$(CFLAGS:-O0=-O1)
  
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
--LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
-+LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -z defs
+-LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
++LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
  else
 -LDFLAGS-libpthread.so := $(LDFLAGS)
 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
@@ -71,23 +68,20 @@
  
  libpthread_FULL_NAME := libpthread-$(VERSION).so
  
-@@ -80,22 +80,26 @@
- libpthread-so-y += $(libpthread_OBJ:.o=.os)
+@@ -80,19 +80,23 @@
+ libpthread-so-y += $(libpthread_OBJ:.o=.oS)
  
  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
 -lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
 +lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so
- objclean-y += libpthread_clean
- headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
- headers_clean-y += linuxthreads_headers_clean
  
  #ifeq ($(DOMULTI),n)
--$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
-+$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
+-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
++$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  #else
--#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a
-+#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a
+-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
++#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  #	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  #endif
  	$(Q)$(RM) $@
@@ -98,6 +92,6 @@
 +	$(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
 +	$(LN) -sf $(notdir $<) $@
 +
- $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
- 	$(Q)$(RM) $@
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+ $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+ endif

================================================================
Index: SOURCES/uClibc-toolchain-wrapper.patch
diff -u SOURCES/uClibc-toolchain-wrapper.patch:1.8 SOURCES/uClibc-toolchain-wrapper.patch:1.9
--- SOURCES/uClibc-toolchain-wrapper.patch:1.8	Sun Jun  3 22:11:29 2007
+++ SOURCES/uClibc-toolchain-wrapper.patch	Sat Jan 10 19:52:01 2009
@@ -768,27 +768,27 @@
 +
 +
 diff -urN uClibc-0.9.29.org/Makefile.in uClibc-0.9.29/Makefile.in
---- uClibc-0.9.29.org/Makefile.in	2007-03-19 10:49:04.000000000 +0100
-+++ uClibc-0.9.29/Makefile.in	2007-06-03 22:10:14.593807939 +0200
-@@ -17,7 +17,7 @@
+--- uClibc-0.9.30/Makefile.in.orig	2008-11-07 22:15:53.000000000 +0100
++++ uClibc-0.9.30/Makefile.in	2009-01-10 11:45:01.578456370 +0100
+@@ -19,7 +19,7 @@
  
  ifeq ($(HAVE_DOT_CONFIG),y)
  
 -all: pregen libs
 +all: pregen libs toolchain
+ libs: pregen
  
  # In this section, we need .config
- -include .config.cmd
-@@ -108,7 +108,7 @@
- 
- pregen: headers
+@@ -178,7 +178,7 @@
+ 	HOSTCC="$(HOSTCC)" \
+ 	install_dev
  
 -install: install_runtime install_dev
 +install: install_runtime install_dev install_toolchain
  
  
  RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
-@@ -272,6 +272,12 @@
+@@ -420,6 +420,12 @@
  	fi
  endif
  
@@ -798,373 +798,6 @@
 +install_toolchain: toolchain
 +	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
 +
+ hostutils:
+ 	$(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" -C utils hostutils
  utils:
- 	$(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
- 
-diff -urN uClibc-0.9.29.org/Makefile.in.orig uClibc-0.9.29/Makefile.in.orig
---- uClibc-0.9.29.org/Makefile.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ uClibc-0.9.29/Makefile.in.orig	2007-03-19 10:49:04.000000000 +0100
-@@ -0,0 +1,363 @@
-+# Makefile for uClibc
-+#
-+# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
-+#
-+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+#
-+
-+#--------------------------------------------------------------
-+# You shouldn't need to mess with anything beyond this point...
-+#--------------------------------------------------------------
-+noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
-+	defconfig allyesconfig allnoconfig clean distclean \
-+	release dist tags
-+
-+include $(top_builddir)Rules.mak
-+sub_headers := headers
-+
-+ifeq ($(HAVE_DOT_CONFIG),y)
-+
-+all: pregen libs
-+
-+# In this section, we need .config
-+-include .config.cmd
-+
-+include $(top_srcdir)ldso/Makefile.in
-+include $(top_srcdir)libcrypt/Makefile.in
-+include $(top_srcdir)libintl/Makefile.in
-+include $(top_srcdir)libm/Makefile.in
-+include $(top_srcdir)libnsl/Makefile.in
-+include $(top_srcdir)libresolv/Makefile.in
-+include $(top_srcdir)libutil/Makefile.in
-+include $(top_srcdir)libpthread/Makefile.in
-+include $(top_srcdir)librt/Makefile.in
-+include $(top_srcdir)extra/locale/Makefile.in
-+
-+# last included to catch all the objects added by others (locales/threads)
-+include $(top_srcdir)libc/Makefile.in
-+
-+include/bits/uClibc_config.h: extra/config/conf .config
-+	$(Q)$(INSTALL) -d $(dir $@)
-+	$(Q)@$< -o $(top_srcdir)extra/Configs/Config.in
-+	$(top_srcdir)extra/scripts/conf-header.sh .config > include/bits/uClibc_config.h
-+
-+
-+# For the moment, we have to keep re-running this target
-+# because the fix includes scripts rely on pre-processers
-+# in order to generate the headers correctly :(.  That
-+# means we can't use the $(HOSTCC) in order to get the
-+# correct output.
-+ifeq ($(ARCH_USE_MMU),y)
-+export header_extra_args =
-+else
-+export header_extra_args = -n
-+endif
-+HEADERS_BITS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common/bits/*.h))
-+HEADERS_BITS_ARCH   := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/*.h))
-+HEADERS_BITS_SUBARCH   := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/*.h))
-+HEADERS_BITS_COMMON := $(filter-out $(HEADERS_BITS_ARCH) $(HEADERS_BITS_SUBARCH),$(HEADERS_BITS_COMMON))
-+headers: include/bits/uClibc_config.h
-+	$(Q)$(MAKE) headers-y
-+	$(Q)\
-+	set -e; \
-+	if [ -e libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h ] ; then \
-+		$(LN) -fs ../libc/sysdeps/linux/$(TARGET_ARCH)/fpu_control.h include/ ; \
-+	else \
-+		$(LN) -fs ../libc/sysdeps/linux/common/fpu_control.h include/ ; \
-+	fi; \
-+	for f in dl-osinfo.h hp-timing.h ; do \
-+		$(LN) -fs ../libc/sysdeps/linux/common/$$f include/ ; \
-+	done
-+	$(Q)\
-+	cd include/bits; \
-+	set -e; \
-+	for i in $(HEADERS_BITS_COMMON) ; do \
-+		$(LN) -fs ../../libc/sysdeps/linux/common/bits/$$i .; \
-+	done; \
-+	for i in $(HEADERS_BITS_ARCH) ; do \
-+		$(LN) -fs ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$$i .; \
-+	done; \
-+	for i in $(HEADERS_BITS_SUBARCH) ; do \
-+		$(LN) -fs ../../libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/$$i .; \
-+	done
-+	$(Q)\
-+	cd include/sys; \
-+	set -e; \
-+	for i in `ls ../../libc/sysdeps/linux/common/sys/*.h` ; do \
-+		$(LN) -fs $$i .; \
-+	done; \
-+	if [ -d ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
-+		for i in `ls ../../libc/sysdeps/linux/$(TARGET_ARCH)/sys/*.h` ; do \
-+			$(LN) -fs $$i .; \
-+		done; \
-+	fi
-+	$(Q)\
-+	set -e; \
-+	cd $(top_builddir); \
-+	tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \
-+	[ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \
-+	KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \
-+	if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
-+		$(RM) $$tmp; \
-+	else \
-+		mv -f $$tmp include/bits/sysnum.h; \
-+	fi
-+ifeq ($(UCLIBC_HAS_LOCALE),y)
-+	$(MAKE) locale_headers
-+endif
-+
-+pregen: headers
-+
-+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)
-+
-+# Installs header files.
-+install_headers:
-+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
-+	printf ".svn\n.cvsignore\nCVS\n" > tar_exclude ; \
-+	$(TAR) -chf - -X tar_exclude include \
-+		| $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX)
-+	rm -f tar_exclude
-+	printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
-+		$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
-+	echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
-+		$(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/_lfs_64.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_uintmaxtostr.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/kernel_sigaction.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/kernel_stat.h
-+ifneq ($(UCLIBC_HAS_FLOATS),y)
-+	# Remove floating point related headers since float support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/fpu_control.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/ieee754.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/math.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/tgmath.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/uClibc_fpmax.h
-+endif
-+ifneq ($(UCLIBC_HAS_WCHAR),y)
-+	# Remove wide char headers since wide char support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/wctype.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/wchar.h
-+endif
-+ifneq ($(UCLIBC_HAS_LOCALE),y)
-+	# Remove iconv header since locale support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/iconv.h
-+endif
-+ifneq ($(UCLIBC_HAS_GLIBC_CUSTOM_PRINTF),y)
-+	# Remove printf header since custom print specifier support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/printf.h
-+endif
-+ifneq ($(UCLIBC_HAS_XLOCALE),y)
-+	# Remove xlocale header since extended locale support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/xlocale.h
-+endif
-+ifneq ($(UCLIBC_HAS_GETTEXT_AWARENESS),y)
-+	# Remove libintl header since gettext support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/libintl.h
-+endif
-+ifneq ($(UCLIBC_HAS_REGEX),y)
-+	# Remove regex headers since regex support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/regex.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/regexp.h
-+endif
-+ifneq ($(UCLIBC_HAS_WORDEXP),y)
-+	# Remove wordexp header since wordexp support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/wordexp.h
-+endif
-+ifneq ($(UCLIBC_HAS_FTW),y)
-+	# Remove ftw header since ftw support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/ftw.h
-+endif
-+ifneq ($(UCLIBC_HAS_GLOB),y)
-+	# Remove glob header since glob support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/glob.h
-+endif
-+ifneq ($(UCLIBC_HAS_GNU_GETOPT),y)
-+ifneq ($(UCLIBC_HAS_GETOPT_LONG),y)
-+	# Remove getopt header since gnu getopt support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/getopt.h
-+endif
-+endif
-+ifneq ($(UCLIBC_HAS_SHADOW),y)
-+	# Remove shadow header since shadow password support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/shadow.h
-+endif
-+ifneq ($(PTHREADS_DEBUG_SUPPORT),y)
-+	# Remove thread_db header since thread debug support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/thread_db.h
-+endif
-+ifneq ($(UCLIBC_HAS_THREADS),y)
-+	# Remove pthread headers since thread support is disabled.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/*thread*.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
-+endif
-+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-+	# Remove this as it is only used internally.
-+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/tls.h
-+endif
-+	- at for i in `find $(PREFIX)$(DEVEL_PREFIX)include -type d` ; do \
-+	    chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
-+	done
-+	-chown -R `id | sed 's/^uid=\([0-9]*\).*gid=\([0-9]*\).*$$/\1:\2/'` $(PREFIX)$(DEVEL_PREFIX)include
-+
-+# Installs development library links.
-+install_dev: install_headers
-+	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
-+	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
-+ifeq ($(HAVE_SHARED),y)
-+	for i in `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; \
-+	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
-+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 \
-+				| sed -e 's/\.a$$/_pic.a/'`; \
-+		done ; \
-+	fi
-+endif
-+endif
-+ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
-+	for file in lib/lib*.gdb; do \
-+		if test -f $$file; then \
-+			$(INSTALL) -m 755 $$file $(PREFIX)$(DEVEL_PREFIX)lib; \
-+			$(INSTALL) -m 755 `echo $$file | sed 's/\.gdb$$//'` \
-+			  $(PREFIX)$(DEVEL_PREFIX)lib; \
-+		fi; \
-+	done
-+endif
-+
-+# Installs run-time libraries
-+install_runtime:
-+ifeq ($(HAVE_SHARED),y)
-+	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
-+	$(INSTALL) -m 644 lib/lib*-$(VERSION).so \
-+		$(PREFIX)$(RUNTIME_PREFIX)lib
-+	cd lib && $(TAR) -cf - *.so.* | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)lib
-+	@if [ -x lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
-+		set -e; \
-+		$(SHELL_SET_X); \
-+		$(INSTALL) -m 755 lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so \
-+			$(PREFIX)$(RUNTIME_PREFIX)lib; \
-+	fi
-+endif
-+
-+utils:
-+	$(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
-+
-+# Installs helper applications, such as 'ldd' and 'ldconfig'
-+install_utils: utils
-+	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
-+
-+else # ifeq ($(HAVE_DOT_CONFIG),y)
-+
-+all: menuconfig
-+
-+headers:
-+	@echo "Need to make a config file first, run: make menuconfig"
-+	@false
-+
-+endif # ifeq ($(HAVE_DOT_CONFIG),y)
-+
-+include/bits:
-+	$(INSTALL) -d include/bits
-+
-+# configuration
-+# ---------------------------------------------------------------------------
-+extra/config/conf extra/config/mconf: include/bits
-+	$(Q)$(MAKE) -C extra/config $(notdir $@)
-+
-+menuconfig: extra/config/mconf include/bits
-+	$(Q)./extra/config/mconf extra/Configs/Config.in
-+
-+config: extra/config/conf include/bits
-+	$(Q)./extra/config/conf extra/Configs/Config.in
-+
-+oldconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -o extra/Configs/Config.in
-+
-+silentoldconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -s extra/Configs/Config.in
-+
-+randconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -r extra/Configs/Config.in
-+
-+allyesconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -y extra/Configs/Config.in
-+	sed -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" .config
-+	sed -i -e "s/^DOASSERTS=.*/# DOASSERTS is not set/" .config
-+	sed -i -e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" .config
-+	sed -i -e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" .config
-+	sed -i -e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" .config
-+	$(Q)./extra/config/conf -o extra/Configs/Config.in
-+
-+allnoconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -n extra/Configs/Config.in
-+
-+defconfig: extra/config/conf include/bits
-+	$(Q)./extra/config/conf -d extra/Configs/Config.in
-+
-+clean:
-+	$(Q)$(RM) -r lib include/bits
-+	$(RM) lib*/*.a ldso/*/*.a libpthread/*/*.a
-+	$(RM) include/fpu_control.h include/dl-osinfo.h include/hp-timing.h
-+	$(MAKE) -C extra/locale locale_clean
-+	$(MAKE) headers_clean-y
-+	$(MAKE) -s -C test clean
-+	$(MAKE) -C utils utils_clean
-+	@set -e; \
-+	for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
-+		$(RM) include/sys/$$i; \
-+	done; \
-+	if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
-+		for i in `(cd libc/sysdeps/linux/$(TARGET_ARCH)/sys; ls *.h)` ; do \
-+			$(RM) include/sys/$$i; \
-+		done; \
-+	fi
-+	@$(RM) include/linux include/asm*
-+	-find . \( -name \*.o -o -name \*.os -o -name \*.oS \) -exec $(RM) {} \;
-+
-+distclean: clean
-+	-find . \( -name core -o -name \*.orig -o -name \*~ \) -exec $(RM) {} \;
-+	$(RM) .config .config.old .config.cmd
-+	$(RM) extra/locale/*.tgz
-+	$(MAKE) -C extra/config distclean
-+
-+dist release:
-+	$(RM) -r ../uClibc-$(VERSION) ../uClibc-$(VERSION).tar.bz2
-+	svn -q export . ../uClibc-$(VERSION)
-+	$(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION)
-+	du -b ../uClibc-$(VERSION).tar.bz2
-+
-+test check:
-+	$(Q)$(MAKE) -C test
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/uClibc-debug.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/uClibc-newsoname.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/uClibc-toolchain-wrapper.patch?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list