- updated to 0.9.31

- updated stdio-unhide,toolchain-wrapper patches
- added make patch (MULTILIB_DIR fix)
- updated config: now THREADS must be enabled explicitly;
  use old linuxthreads as new fail to build on i386

Changed files:
    uClibc-make.patch -> 1.1
    uClibc-stdio-unhide.patch -> 1.3
    uClibc-toolchain-wrapper.patch -> 1.14
    uClibc.spec -> 1.194

diff --git a/uClibc-make.patch b/uClibc-make.patch
new file mode 100644 (file)
index 0000000..cf14997
--- /dev/null
+++ b/uClibc-make.patch
@@ -0,0 +1,11 @@
+--- uClibc-0.9.31/Makefile.in.orig     2010-08-19 22:48:44.950821619 +0200
++++ uClibc-0.9.31/Makefile.in  2010-08-20 08:57:52.934824134 +0200
+@@ -287,7 +287,7 @@
+       ### ucontext.h
+ 
+ ifneq ($(findstring install,$(MAKECMDGOALS)),)
+-$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) $(addprefix $(PREFIX)$(DEVEL_PREFIX),include lib):
++$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR) $(addprefix $(PREFIX)$(DEVEL_PREFIX),include $(MULTILIB_DIR)):
+       $(do_mkdir)
+ endif
+ 

diff --git a/uClibc-stdio-unhide.patch b/uClibc-stdio-unhide.patch
index c1ec0e13ee8143aed273235ff93fdc1064c41fdd..a334835ae3c38a19d4ca26310f553bd6f2565a58 100644 (file)
--- a/uClibc-stdio-unhide.patch
+++ b/uClibc-stdio-unhide.patch
@@ -1,14 +1,14 @@
---- 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.
-  */
+--- 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)
+ 
 -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 @@

diff --git a/uClibc-toolchain-wrapper.patch b/uClibc-toolchain-wrapper.patch
index c4309eb3b3837d1ccb5d2a58a029c3d0a121c584..a0f97c4c282df300b1d7b392f788065ae708928e 100644 (file)
--- a/uClibc-toolchain-wrapper.patch
+++ b/uClibc-toolchain-wrapper.patch
@@ -771,9 +771,9 @@ diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/Makefile uClibc-0.9.29/extra/gcc-uC
 +      rm -f gcc-uClibc.h *-uclibc-gcc *-uclibc-ld core
 +
 +
---- 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 @@
+--- 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 @@
  
  ifeq ($(HAVE_DOT_CONFIG),y)
  
@@ -782,16 +782,16 @@ diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/Makefile uClibc-0.9.29/extra/gcc-uC
  libs: pregen
  
  # In this section, we need .config
-@@ -187,7 +187,7 @@
+@@ -188,7 +188,7 @@
        HOSTCC="$(HOSTCC)" \
-       install_dev
+       install
  
 -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)
-@@ -445,6 +445,12 @@
+ 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 @@
  
  endif # ifeq ($(HAVE_DOT_CONFIG),y)
  
@@ -801,6 +801,6 @@ diff -urN uClibc-0.9.29.org/extra/gcc-uClibc/Makefile uClibc-0.9.29/extra/gcc-uC
 +install_toolchain: toolchain
 +      $(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C extra/gcc-uClibc install
 +
- hostutils: headers
+ hostutils:
        $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
  

diff --git a/uClibc.spec b/uClibc.spec
index 0982aee9914ec4ca7f5b5babb01ddab2b8b08e78..6202babae7e9501eb57e332970370c882b7a5a8e 100644 (file)
--- a/uClibc.spec
+++ b/uClibc.spec
@@ -10,13 +10,13 @@
 Summary:       C library optimized for size
 Summary(pl.UTF-8):     Biblioteka C zoptymalizowana na rozmiar
 Name:          uClibc
-Version:       0.9.30.3
-Release:       3
+Version:       0.9.31
+Release:       1
 Epoch:         3
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 73a4bf4a0fa508b01a7a3143574e3d21
+# Source0-md5: 52fb8a494758630c8d3ddd7f1e0daafd
 Patch0:                %{name}-newsoname.patch
 Patch1:                %{name}-toolchain-wrapper.patch
 Patch2:                %{name}-targetcpu.patch
@@ -24,11 +24,13 @@ Patch3:             %{name}-debug.patch
 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
@@ -85,6 +87,7 @@ Biblioteki statyczne uClibc.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # ARCH is already determined by uname -m
 %ifarch %{ix86}
@@ -128,6 +131,8 @@ defconfig=extra/Configs/defconfigs/ia64
 %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
@@ -150,7 +155,6 @@ UCLIBC_SUSV3_LEGACY_MACROS=y
 EOF
 
 %build
-
 # NOTE: 'defconfig' and 'all' must be run in separate make process because of macros
 %{__make} -j1 defconfig \
        %{?with_verbose:VERBOSE=1} \