SOURCES: uClibc-newsoname.patch - updated for 0.9.29

qboosh qboosh at pld-linux.org
Sat May 12 13:27:47 CEST 2007 

Author: qboosh                       Date: Sat May 12 11:27:47 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.9.29

---- Files affected:
SOURCES:
   uClibc-newsoname.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/uClibc-newsoname.patch
diff -u SOURCES/uClibc-newsoname.patch:1.3 SOURCES/uClibc-newsoname.patch:1.4
--- SOURCES/uClibc-newsoname.patch:1.3	Sun Aug 28 09:20:16 2005
+++ SOURCES/uClibc-newsoname.patch	Sat May 12 13:27:42 2007
@@ -1,21 +1,103 @@
---- uClibc-0.9.28/libpthread/Makefile.orig	2005-08-18 00:49:49.000000000 +0200
-+++ uClibc-0.9.28/libpthread/Makefile	2005-08-28 00:04:19.595072696 +0200
-@@ -21,7 +21,8 @@
- 
- #Adjust the soname version to avoid namespace collisions with glibc's libpthread
- LIBPTHREAD=libpthread.a
--LIBPTHREAD_SHARED=libpthread.so
-+LIBPTHREAD_SHARED=libpthread-uclibc.so
-+LIBPTHREAD_SHARED_ORG=libpthread.so
- LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
- 
- LIBTHREAD_DB=libthread_db.a
-@@ -84,6 +85,8 @@
- 		$(TOPDIR)lib/$(LIBPTHREAD_SHARED)
- 	$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
- 		$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
-+	$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-+		$(TOPDIR)lib/$(LIBPTHREAD_SHARED_ORG).$(MAJOR_VERSION)
+--- 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
+@@ -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
+ else
+-LDFLAGS-libpthread.so := $(LDFLAGS)
++LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
  endif
- ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- 	$(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols -soname=$(LIBTHREAD_DB_SHARED).1 \
+ 
+-LIBS-libpthread.so := $(LIBS) $(ldso)
++LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
+ 
+-START_FILE-libpthread.so := $(SHARED_START_FILES)
+-END_FILE-libpthread.so := $(SHARED_END_FILES)
++START_FILE-libpthread-uclibc.so := $(SHARED_START_FILES)
++END_FILE-libpthread-uclibc.so := $(SHARED_END_FILES)
+ 
+ libpthread_FULL_NAME := libpthread-$(VERSION).so
+ 
+@@ -70,19 +70,23 @@
+ 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)
+ 	$(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)
+ #	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+ #endif
+ 
++$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
++	$(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
+@@ -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
+ else
+-LDFLAGS-libpthread.so := $(LDFLAGS)
++LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
+ endif
+ 
+-LIBS-libpthread.so := $(LIBS) $(ldso)
++LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
+ 
+-START_FILE-libpthread.so := $(SHARED_START_FILES)
+-END_FILE-libpthread.so := $(SHARED_END_FILES)
++START_FILE-libpthread-uclibc.so := $(SHARED_START_FILES)
++END_FILE-libpthread-uclibc.so := $(SHARED_END_FILES)
+ 
+ libpthread_FULL_NAME := libpthread-$(VERSION).so
+ 
+@@ -80,22 +80,26 @@
+ 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
+ 	$(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
+ #	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+ #endif
+ 	$(Q)$(RM) $@
+ 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
+ 	$(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
+ 
++$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
++	$(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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list