uClibc-newsoname.patch

   1 --- uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in.orig  2008-11-07 22:15:53.000000000 +0100
   2 +++ uClibc-0.9.30/libpthread/linuxthreads.old/Makefile.in       2009-01-10 11:36:18.378455532 +0100
   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) -Wl,-z,defs
   8 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -Wl,-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,16 +70,20 @@
  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
  31  #ifeq ($(DOMULTI),n)
  32 -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
  33 +$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
  34         $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  35  #else
  36 -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
  37 +#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
  38  #      $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  39  #endif
  40
  41 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
  42 +       $(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
  43 +       $(LN) -sf $(notdir $<) $@
  44 +
  45  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
  46  $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
  47  endif
  48 --- uClibc-0.9.30/libpthread/linuxthreads/Makefile.in.orig      2008-11-07 22:15:53.000000000 +0100
  49 +++ uClibc-0.9.30/libpthread/linuxthreads/Makefile.in   2009-01-10 11:38:44.322453856 +0100
  50 @@ -19,15 +19,15 @@
  51  #CFLAGS:=$(CFLAGS:-O0=-O1)
  52
  53  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
  54 -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
  55 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
  56  else
  57 -LDFLAGS-libpthread.so := $(LDFLAGS)
  58 +LDFLAGS-libpthread-uclibc.so := $(LDFLAGS)
  59  endif
  60
  61 -LIBS-libpthread.so := $(LIBS) $(ldso)
  62 +LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
  63
  64 -START_FILE-libpthread.so := $(SHARED_START_FILES)
  65 -END_FILE-libpthread.so := $(SHARED_END_FILES)
  66 +START_FILE-libpthread-uclibc.so := $(SHARED_START_FILES)
  67 +END_FILE-libpthread-uclibc.so := $(SHARED_END_FILES)
  68
  69  libpthread_FULL_NAME := libpthread-$(VERSION).so
  70
  71 @@ -80,19 +80,23 @@
  72  libpthread-so-y += $(libpthread_OBJ:.o=.oS)
  73
  74  lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
  75 -lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
  76 +lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread-uclibc.so
  77
  78  #ifeq ($(DOMULTI),n)
  79 -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  80 +$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  81         $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  82  #else
  83 -#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  84 +#$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend) $(top_builddir)lib/libpthread_nonshared.a
  85  #      $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
  86  #endif
  87         $(Q)$(RM) $@
  88         $(Q)cp $(top_srcdir)extra/scripts/format.lds $@
  89         $(Q)echo "GROUP ( $(notdir $@).$(MAJOR_VERSION) libpthread_nonshared.a )" >> $@
  90
  91 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
  92 +       $(LN) -sf $(notdir $<).$(MAJOR_VERSION) $@.$(MAJOR_VERSION)
  93 +       $(LN) -sf $(notdir $<) $@
  94 +
  95  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
  96  $(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
  97  endif