packages (DEVEL): uClibc/uClibc-debug.patch, uClibc/uClibc-newsoname.patch, ...

qboosh qboosh at pld-linux.org
Sun Jun 12 10:23:42 CEST 2011 

Author: qboosh                       Date: Sun Jun 12 08:23:42 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated to 0.9.32
- updated newsoname,toolchain-wrapper,debug,stdio-unhide patches
- removed obsolete inotify_init1,sockflags,make patches
- added epoll patch (by Phil Blundell <philb at gnu.org>)

---- Files affected:
packages/uClibc:
   uClibc-debug.patch (1.2 -> 1.2.4.1) , uClibc-newsoname.patch (1.5 -> 1.5.4.1) , uClibc-stdio-unhide.patch (1.3 -> 1.3.4.1) , uClibc-toolchain-wrapper.patch (1.14 -> 1.14.4.1) , uClibc.spec (1.195.4.2 -> 1.195.4.3) , uClibc-epoll.patch (NONE -> 1.1)  (NEW), uClibc-inotify_init1.patch (1.1 -> NONE)  (REMOVED), uClibc-make.patch (1.1 -> NONE)  (REMOVED), uClibc-sockflags.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/uClibc/uClibc-debug.patch
diff -u packages/uClibc/uClibc-debug.patch:1.2 packages/uClibc/uClibc-debug.patch:1.2.4.1
--- packages/uClibc/uClibc-debug.patch:1.2	Sat Jan 10 19:52:00 2009
+++ packages/uClibc/uClibc-debug.patch	Sun Jun 12 10:23:37 2011
@@ -1,11 +1,11 @@
---- 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 @@
+--- uClibc-0.9.32/Rules.mak.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/Rules.mak	2011-06-12 09:22:09.454050098 +0200
+@@ -624,7 +624,7 @@
  
  LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
  ifeq ($(DODEBUG),y)
--CFLAGS += -O0 -g3
-+CFLAGS += $(OPTIMIZATION) -O0 -g3
+-CFLAGS += -O0 -g3 -DDEBUG
++CFLAGS += $(OPTIMIZATION) -O0 -g3 -DDEBUG
  else
- CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS)
+ CFLAGS += $(OPTIMIZATION)
  endif

================================================================
Index: packages/uClibc/uClibc-newsoname.patch
diff -u packages/uClibc/uClibc-newsoname.patch:1.5 packages/uClibc/uClibc-newsoname.patch:1.5.4.1
--- packages/uClibc/uClibc-newsoname.patch:1.5	Sat Jan 10 19:52:00 2009
+++ packages/uClibc/uClibc-newsoname.patch	Sun Jun 12 10:23:37 2011
@@ -1,6 +1,6 @@
---- 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 @@
+--- uClibc-0.9.32/libpthread/linuxthreads.old/Makefile.in.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libpthread/linuxthreads.old/Makefile.in	2011-06-12 09:00:50.687340614 +0200
+@@ -14,16 +14,16 @@
  CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old)
  
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
@@ -10,6 +10,8 @@
 -LDFLAGS-libpthread.so := $(LDFLAGS)
 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
  endif
+-LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libpthread.so := -Wl,--dsbt-index=10
++LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libpthread-uclibc.so := -Wl,--dsbt-index=10
  
 -LIBS-libpthread.so := $(LIBS) $(ldso)
 +LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
@@ -21,7 +23,7 @@
  
  libpthread_FULL_NAME := libpthread-$(VERSION).so
  
-@@ -70,16 +70,20 @@
+@@ -73,13 +73,13 @@
  libpthread-so-y += $(libpthread_OBJ:.o=.os) $(libpthread-shared-y)
  
  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
@@ -31,23 +33,27 @@
  #ifeq ($(DOMULTI),n)
 -$(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))
+ 	$(call link.so,$(libpthread_FULL_NAME),$(ABI_VERSION))
  #else
 -#$(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))
+ #	$(call linkm.so,$(libpthread_FULL_NAME),$(ABI_VERSION))
  #endif
  
+@@ -90,6 +90,10 @@
+ 	$(Q)$(RM) $@
+ 	$(do_ar)
+ 
 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
 +	$(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
 +	$(LN) -sf $(notdir $<) $@
 +
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+ $(libpthread_OUT)/libpthread.oS: 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 @@
+--- uClibc-0.9.32/libpthread/linuxthreads/Makefile.in.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libpthread/linuxthreads/Makefile.in	2011-06-12 09:03:14.797345439 +0200
+@@ -23,15 +23,15 @@
  #CFLAGS:=$(CFLAGS:-O0=-O1)
  
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
@@ -68,7 +74,7 @@
  
  libpthread_FULL_NAME := libpthread-$(VERSION).so
  
-@@ -80,19 +80,23 @@
+@@ -84,13 +84,13 @@
  libpthread-so-y += $(libpthread_OBJ:.o=.oS)
  
  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
@@ -78,15 +84,16 @@
  #ifeq ($(DOMULTI),n)
 -$(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))
+ 	$(call link.so,$(libpthread_FULL_NAME),$(ABI_VERSION))
  #else
 -#$(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))
+ #	$(call linkm.so,$(libpthread_FULL_NAME),$(ABI_VERSION))
  #endif
  	$(Q)$(RM) $@
- 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
- 	$(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
+@@ -98,6 +98,10 @@
+ 	$(Q)echo "GROUP ( $(notdir $@).$(ABI_VERSION) libpthread_nonshared.a )" >> $@.tmp
+ 	$(Q)mv $@.tmp $@
  
 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
 +	$(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)

================================================================
Index: packages/uClibc/uClibc-stdio-unhide.patch
diff -u packages/uClibc/uClibc-stdio-unhide.patch:1.3 packages/uClibc/uClibc-stdio-unhide.patch:1.3.4.1
--- packages/uClibc/uClibc-stdio-unhide.patch:1.3	Mon Aug 23 19:49:58 2010
+++ packages/uClibc/uClibc-stdio-unhide.patch	Sun Jun 12 10:23:37 2011
@@ -1,9 +1,9 @@
---- 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 @@
+--- uClibc-0.9.32/libc/misc/internals/__uClibc_main.c.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/misc/internals/__uClibc_main.c	2011-06-12 09:23:48.324053409 +0200
+@@ -118,7 +118,7 @@
+  */
+ extern int *weak_const_function __errno_location(void);
  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);
  #ifdef __UCLIBC_HAS_LOCALE__

================================================================
Index: packages/uClibc/uClibc-toolchain-wrapper.patch
diff -u packages/uClibc/uClibc-toolchain-wrapper.patch:1.14 packages/uClibc/uClibc-toolchain-wrapper.patch:1.14.4.1
--- packages/uClibc/uClibc-toolchain-wrapper.patch:1.14	Mon Aug 23 19:49:58 2010
+++ packages/uClibc/uClibc-toolchain-wrapper.patch	Sun Jun 12 10:23:37 2011
@@ -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.32/Makefile.in.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/Makefile.in	2011-06-12 09:20:09.634046086 +0200
+@@ -23,7 +23,7 @@
  
  ifeq ($(HAVE_DOT_CONFIG),y)
  
@@ -782,7 +782,7 @@
  libs: pregen
  
  # In this section, we need .config
-@@ -188,7 +188,7 @@
+@@ -192,7 +192,7 @@
  	HOSTCC="$(HOSTCC)" \
  	install
  
@@ -791,7 +791,7 @@
  
  
  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 @@
+@@ -405,6 +405,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: | pregen
  	$(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.4.2 packages/uClibc/uClibc.spec:1.195.4.3
--- packages/uClibc/uClibc.spec:1.195.4.2	Sun Jun 12 08:42:19 2011
+++ packages/uClibc/uClibc.spec	Sun Jun 12 10:23:37 2011
@@ -11,21 +11,19 @@
 Summary:	C library optimized for size
 Summary(pl.UTF-8):	Biblioteka C zoptymalizowana na rozmiar
 Name:		uClibc
-Version:	0.9.31
+Version:	0.9.32
 Release:	1
 Epoch:		4
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://uclibc.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	52fb8a494758630c8d3ddd7f1e0daafd
+Source0:	http://uclibc.org/downloads/%{name}-%{version}.tar.xz
+# Source0-md5:	51660b93b8f1edb486049981fecfd148
 Patch0:		%{name}-newsoname.patch
 Patch1:		%{name}-toolchain-wrapper.patch
 Patch2:		%{name}-targetcpu.patch
 Patch3:		%{name}-debug.patch
 Patch4:		%{name}-stdio-unhide.patch
-Patch5:		%{name}-inotify_init1.patch
-Patch6:		%{name}-sockflags.patch
-Patch7:		%{name}-make.patch
+Patch5:		%{name}-epoll.patch
 URL:		http://uclibc.org/
 BuildRequires:	binutils-gasp
 BuildRequires:	cpp
@@ -35,7 +33,9 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	which
+BuildRequires:	xz
 ExclusiveArch:	alpha %{ix86} ppc sparc sparcv9 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,8 +87,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 # ARCH is already determined by uname -m
 %ifarch %{ix86}
@@ -246,7 +244,6 @@
 	fi
 done
 
-%{__rm} -r $RPM_BUILD_ROOT%{uclibc_root}/usr/include/{linux,asm*}
 # rpm -ql linux-libc-headers | awk -F/ ' /^\/usr\/include\// { print "/usr/include/" $4 } ' | sort -u
 for dir in asm asm-generic linux mtd rdma sound video xen; do
 	ln -sf /usr/include/${dir} $RPM_BUILD_ROOT%{uclibc_root}/usr/include/${dir}
@@ -325,6 +322,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195.4.3  2011/06/12 08:23:37  qboosh
+- updated to 0.9.32
+- updated newsoname,toolchain-wrapper,debug,stdio-unhide patches
+- removed obsolete inotify_init1,sockflags,make patches
+- added epoll patch (by Phil Blundell <philb at gnu.org>)
+
 Revision 1.195.4.2  2011/06/12 06:42:19  qboosh
 - mention epoch 4 in changelog
 

================================================================
Index: packages/uClibc/uClibc-epoll.patch
diff -u /dev/null packages/uClibc/uClibc-epoll.patch:1.1
--- /dev/null	Sun Jun 12 10:23:42 2011
+++ packages/uClibc/uClibc-epoll.patch	Sun Jun 12 10:23:37 2011
@@ -0,0 +1,18 @@
+--- uClibc-0.9.32/libc/sysdeps/linux/common/epoll.c.orig	2011-06-08 21:35:20.000000000 +0200
++++ uClibc-0.9.32/libc/sysdeps/linux/common/epoll.c	2011-06-12 10:09:14.380811355 +0200
+@@ -67,12 +67,13 @@
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
+ 						int timeout, const sigset_t *set)
+ {
++	int nsig = _NSIG / 8;
+ 	if (SINGLE_THREAD_P)
+-		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ 	else {
+ 		int oldtype = LIBC_CANCEL_ASYNC ();
+-		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
++		int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
+ 		LIBC_CANCEL_RESET (oldtype);
+ 		return result;
+ 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-debug.patch?r1=1.2&r2=1.2.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-newsoname.patch?r1=1.5&r2=1.5.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-stdio-unhide.patch?r1=1.3&r2=1.3.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc-toolchain-wrapper.patch?r1=1.14&r2=1.14.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uClibc/uClibc.spec?r1=1.195.4.2&r2=1.195.4.3&f=u

More information about the pld-cvs-commit mailing list