SOURCES (DEVEL): uClibc-newsoname.patch - hopefully updated

sparky sparky at pld-linux.org
Wed Jan 4 17:41:23 CET 2006


Author: sparky                       Date: Wed Jan  4 16:41:23 2006 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- hopefully updated

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

---- Diffs:

================================================================
Index: SOURCES/uClibc-newsoname.patch
diff -u SOURCES/uClibc-newsoname.patch:1.3 SOURCES/uClibc-newsoname.patch:1.3.2.1
--- SOURCES/uClibc-newsoname.patch:1.3	Sun Aug 28 09:20:16 2005
+++ SOURCES/uClibc-newsoname.patch	Wed Jan  4 17:41:17 2006
@@ -1,21 +1,19 @@
---- 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 @@
+diff -ru uClibc/libpthread/linuxthreads.old/Makefile.in uClibc.newsoname/libpthread/linuxthreads.old/Makefile.in
+--- uClibc/libpthread/linuxthreads.old/Makefile.in	2006-01-03 09:12:10.000000000 +0100
++++ uClibc.newsoname/libpthread/linuxthreads.old/Makefile.in	2006-01-04 17:36:29.000000000 +0100
+@@ -71,9 +71,14 @@
+ headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
+ headers_clean-y += linuxthreads_headers_clean
  
- #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
+-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
++$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc)
++	@# link.so takes info about soname from $@
+ 	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  
- 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)
- endif
- ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- 	$(LD) $(LIBTHREAD_DB_LDFLAGS) --warn-unresolved-symbols -soname=$(LIBTHREAD_DB_SHARED).1 \
++$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
++	$(LN) -sf $(firstword $^) $@.$(MAJOR_VERSION)
++	$(LN) -sf $(firstword $^) $@
++	
+ $(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.3.2.1&f=u



More information about the pld-cvs-commit mailing list