packages: uClibc/uClibc-stdio-unhide.patch, uClibc/uClibc-toolchain-wrapper...

baggins baggins at pld-linux.org
Wed Sep 22 14:35:24 CEST 2010 

Author: baggins                      Date: Wed Sep 22 12:35:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- back to 0.9.30.3 (0.9.31 on UCLIBC_0_9_31 branch)
- programs statically linked with 0.9.31 segfault on ix86
	(example  https://bugs.busybox.net/show_bug.cgi?id=2431)
- rel 4, epoch 4

---- Files affected:
packages/uClibc:
   uClibc-stdio-unhide.patch (1.3 -> 1.4) , uClibc-toolchain-wrapper.patch (1.14 -> 1.15) , uClibc.spec (1.195 -> 1.196) 

---- Diffs:

================================================================
Index: packages/uClibc/uClibc-stdio-unhide.patch
diff -u packages/uClibc/uClibc-stdio-unhide.patch:1.3 packages/uClibc/uClibc-stdio-unhide.patch:1.4
--- packages/uClibc/uClibc-stdio-unhide.patch:1.3	Mon Aug 23 19:49:58 2010
+++ packages/uClibc/uClibc-stdio-unhide.patch	Wed Sep 22 14:35:19 2010
@@ -1,14 +1,14 @@
---- uClibc-0.9.31/libc/misc/internals/__uClibc_main.c.orig	2010-04-02 17:34:27.000000000 +0200
-+++ uClibc-0.9.31/libc/misc/internals/__uClibc_main.c	2010-08-19 22:44:43.818819943 +0200
-@@ -68,7 +68,7 @@
- extern int *weak_const_function __h_errno_location(void);
- libc_hidden_proto(__h_errno_location)
- 
+--- uClibc-0.9.29/libc/misc/internals/__uClibc_main.c.orig	2007-06-03 22:49:56.106515000 +0200
++++ uClibc-0.9.29/libc/misc/internals/__uClibc_main.c	2007-06-03 23:04:27.296161963 +0200
+@@ -78,7 +78,7 @@
+ /*
+  * Prototypes.
+  */
 -extern void weak_function _stdio_init(void) attribute_hidden;
 +extern void weak_function _stdio_init(void);
+ extern int *weak_const_function __errno_location(void);
+ extern int *weak_const_function __h_errno_location(void);
  #ifdef __UCLIBC_HAS_LOCALE__
- extern void weak_function _locale_init(void) attribute_hidden;
- #endif
 --- uClibc-0.9.29/libc/stdlib/_atexit.c.orig	2007-05-04 16:13:17.000000000 +0200
 +++ uClibc-0.9.29/libc/stdlib/_atexit.c	2007-06-04 00:40:04.671116329 +0200
 @@ -305,7 +305,7 @@

================================================================
Index: packages/uClibc/uClibc-toolchain-wrapper.patch
diff -u packages/uClibc/uClibc-toolchain-wrapper.patch:1.14 packages/uClibc/uClibc-toolchain-wrapper.patch:1.15
--- packages/uClibc/uClibc-toolchain-wrapper.patch:1.14	Mon Aug 23 19:49:58 2010
+++ packages/uClibc/uClibc-toolchain-wrapper.patch	Wed Sep 22 14:35:19 2010
@@ -771,9 +771,9 @@
 +	rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
 +
 +
---- uClibc-0.9.31/Makefile.in.orig	2010-04-02 17:34:27.000000000 +0200
-+++ uClibc-0.9.31/Makefile.in	2010-08-19 22:42:13.974823295 +0200
-@@ -24,7 +24,7 @@
+--- uClibc-0.9.30.3/Makefile.in.orig	2010-03-12 20:32:42.000000000 +0100
++++ uClibc-0.9.30.3/Makefile.in	2010-03-25 08:10:37.622710245 +0100
+@@ -19,7 +19,7 @@
  
  ifeq ($(HAVE_DOT_CONFIG),y)
  
@@ -782,16 +782,16 @@
  libs: pregen
  
  # In this section, we need .config
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@
  	HOSTCC="$(HOSTCC)" \
- 	install
+ 	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)$(MULTILIB_DIR) $(RUNTIME_PREFIX)$(MULTILIB_DIR))
-@@ -383,6 +383,12 @@
+ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB=$(shell $(top_srcdir)extra/scripts/relative_path.sh $(DEVEL_PREFIX)lib $(RUNTIME_PREFIX)lib)
+@@ -445,6 +445,12 @@
  
  endif # ifeq ($(HAVE_DOT_CONFIG),y)
  
@@ -801,6 +801,6 @@
 +install_toolchain: toolchain
 +	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
 +
- hostutils:
+ hostutils: headers
  	$(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
  

================================================================
Index: packages/uClibc/uClibc.spec
diff -u packages/uClibc/uClibc.spec:1.195 packages/uClibc/uClibc.spec:1.196
--- packages/uClibc/uClibc.spec:1.195	Mon Aug 23 20:53:04 2010
+++ packages/uClibc/uClibc.spec	Wed Sep 22 14:35:19 2010
@@ -11,13 +11,13 @@
 Summary:	C library optimized for size
 Summary(pl.UTF-8):	Biblioteka C zoptymalizowana na rozmiar
 Name:		uClibc
-Version:	0.9.31
-Release:	1
-Epoch:		3
+Version:	0.9.30.3
+Release:	4
+Epoch:		4
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	52fb8a494758630c8d3ddd7f1e0daafd
+# Source0-md5:	73a4bf4a0fa508b01a7a3143574e3d21
 Patch0:		%{name}-newsoname.patch
 Patch1:		%{name}-toolchain-wrapper.patch
 Patch2:		%{name}-targetcpu.patch
@@ -25,13 +25,11 @@
 Patch4:		%{name}-stdio-unhide.patch
 Patch5:		%{name}-inotify_init1.patch
 Patch6:		%{name}-sockflags.patch
-Patch7:		%{name}-make.patch
 URL:		http://uclibc.org/
 BuildRequires:	binutils-gasp
 BuildRequires:	cpp
 BuildRequires:	gcc >= 5:3.0
 BuildRequires:	linux-libc-headers >= 7:2.6.24
-BuildRequires:	make >= 3.80
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
@@ -88,7 +86,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 # ARCH is already determined by uname -m
 %ifarch %{ix86}
@@ -132,8 +129,6 @@
 %endif
 
 cat <<'EOF' >> $defconfig
-# HAS_NO_THREADS is not set
-LINUXTHREADS_OLD=y
 UCLIBC_HAS_IPV6=y
 DO_C99_MATH=y
 UCLIBC_HAS_RPC=y
@@ -149,8 +144,6 @@
 UCLIBC_HAS_PRINTF_M_SPEC=y
 UCLIBC_SUSV3_LEGACY=y
 UCLIBC_SUSV3_LEGACY_MACROS=y
-# util-linux wants it
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
 # DOSTRIP is not set
 %{?debug:DODEBUG=y}
 %{?debug:SUPPORT_LD_DEBUG=y}
@@ -158,6 +151,7 @@
 EOF
 
 %build
+
 # NOTE: 'defconfig' and 'all' must be run in separate make process because of macros
 %{__make} -j1 defconfig \
 	%{?with_verbose:VERBOSE=1} \
@@ -329,6 +323,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2010/09/22 12:35:19  baggins
+- back to 0.9.30.3 (0.9.31 on UCLIBC_0_9_31 branch)
+- programs statically linked with 0.9.31 segfault on ix86
+	(example  https://bugs.busybox.net/show_bug.cgi?id=2431)
+- rel 4, epoch 4
+
 Revision 1.195  2010/08/23 18:53:04  baggins
 - enable UCLIBC_HAS_PROGRAM_INVOCATION_NAME for util-linux
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-stdio-unhide.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-toolchain-wrapper.patch?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc.spec?r1=1.195&r2=1.196&f=u

More information about the pld-cvs-commit mailing list