uClibc-newsoname.patch

   1 --- uClibc-0.9.29/libpthread/linuxthreads.old/Makefile.in.orig  2007-03-19 10:49:04.000000000 +0100
   2 +++ uClibc-0.9.29/libpthread/linuxthreads.old/Makefile.in       2007-05-12 12:00:56.716329632 +0200
   3 @@ -12,15 +12,15 @@
   4  CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old)
   5
   6  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
   7 -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
   8 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -z defs
   9  else
  10 -LDFLAGS-libpthread.so := $(LDFLAGS)
  11 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
  12  endif
  13
  14 -LIBS-libpthread.so := $(LIBS) $(ldso)
  15 +LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
  16
  17 -START_FILE-libpthread.so := $(SHARED_START_FILES)
  18 -END_FILE-libpthread.so := $(SHARED_END_FILES)
  19 +START_FILE-libpthread-uclibc.so := $(SHARED_START_FILES)
  20 +END_FILE-libpthread-uclibc.so := $(SHARED_END_FILES)
  21
  22  libpthread_FULL_NAME := libpthread-$(VERSION).so
  23
  24 @@ -70,19 +70,23 @@
  25  libpthread-so-y += $(libpthread_OBJ:.o=.os) $(libpthread-shared-y)
  26
  27  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
  28 -lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
  29 +lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so
  30  objclean-y += libpthread_clean
  31  headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
  32  headers_clean-y += linuxthreads_headers_clean
  33
  34  #ifeq ($(DOMULTI),n)
  35 -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
  36 +$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc)
  37         $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  38  #else
  39 -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
  40 +#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc)
  41  #      $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  42  #endif
  43
  44 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
  45 +       $(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
  46 +       $(LN) -sf $(notdir $<) $@
  47 +
  48  $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
  49         $(Q)$(RM) $@
  50  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
  51 --- uClibc-0.9.29/libpthread/linuxthreads/Makefile.in.orig      2007-03-19 10:49:04.000000000 +0100
  52 +++ uClibc-0.9.29/libpthread/linuxthreads/Makefile.in   2007-05-12 11:56:54.194509100 +0200
  53 @@ -19,15 +19,15 @@
  54  #CFLAGS:=$(CFLAGS:-O0=-O1)
  55
  56  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
  57 -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
  58 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -z defs
  59  else
  60 -LDFLAGS-libpthread.so := $(LDFLAGS)
  61 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
  62  endif
  63
  64 -LIBS-libpthread.so := $(LIBS) $(ldso)
  65 +LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
  66
  67 -START_FILE-libpthread.so := $(SHARED_START_FILES)
  68 -END_FILE-libpthread.so := $(SHARED_END_FILES)
  69 +START_FILE-libpthread-uclibc.so := $(SHARED_START_FILES)
  70 +END_FILE-libpthread-uclibc.so := $(SHARED_END_FILES)
  71
  72  libpthread_FULL_NAME := libpthread-$(VERSION).so
  73
  74 @@ -80,22 +80,26 @@
  75  libpthread-so-y += $(libpthread_OBJ:.o=.os)
  76
  77  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
  78 -lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
  79 +lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so
  80  objclean-y += libpthread_clean
  81  headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
  82  headers_clean-y += linuxthreads_headers_clean
  83
  84  #ifeq ($(DOMULTI),n)
  85 -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
  86 +$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
  87         $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  88  #else
  89 -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a
  90 +#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc) $(top_builddir)lib/libpthread_nonshared.a
  91  #      $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  92  #endif
  93         $(Q)$(RM) $@
  94         $(Q)cp $(top_srcdir)extra/scripts/format.lds $@
  95         $(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
  96
  97 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
  98 +       $(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
  99 +       $(LN) -sf $(notdir $<) $@
 100 +
 101  $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
 102         $(Q)$(RM) $@
 103  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)