rename libpthread_nonshared.a

Peter S. Mazinger ps.m at gmx.net
Tue Aug 22 18:32:29 UTC 2006


the patch adds a variable for the name of the non-shared thread library 
defaulting to pthread_nonshared.a (not prefixed with lib, it is not for 
usage like -lpthread_nonshared)

for libpthread/*/Makefile.in do
s/libpthread_nonshared.a/$(NONSHARED_LIBPTNAME)/
sorry, no patch

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2
-------------- next part --------------
diff -urN --exclude .svn --exclude CVS --exclude .cvsignore --exclude libpthread --exclude test uClibc.orig/Makefile.in uClibc/Makefile.in
--- uClibc.orig/Makefile.in	2006-06-12 17:44:06 +0200
+++ uClibc/Makefile.in	2006-08-10 20:55:56 +0200
@@ -226,7 +226,7 @@
 	if [ -f $(top_builddir)lib/libpthread.so -a -f $(PREFIX)$(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) ] ; then \
 		$(RM) $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
 		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
-		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/libpthread_nonshared.a )" \
+		echo "GROUP ( $(RUNTIME_PREFIX)lib/libpthread.so.$(MAJOR_VERSION) $(DEVEL_PREFIX)lib/$(NONSHARED_LIBPTNAME) )" \
 			>> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
 	fi
 endif
diff -urN --exclude .svn --exclude CVS --exclude .cvsignore --exclude libpthread --exclude test uClibc.orig/Makerules uClibc/Makerules
--- uClibc.orig/Makerules	2006-06-12 17:44:06 +0200
+++ uClibc/Makerules	2006-06-07 13:47:48 +0200
@@ -248,7 +248,7 @@
 	$(do_strip)
 	$(do_ar)
 
-$(top_builddir)lib/libpthread_nonshared.a: $(libpthread-nonshared-y)
+$(top_builddir)lib/$(NONSHARED_LIBPTNAME): $(libpthread-nonshared-y)
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)$(RM) $@
 	$(do_strip)
diff -urN --exclude .svn --exclude CVS --exclude .cvsignore --exclude libpthread --exclude test uClibc.orig/Rules.mak uClibc/Rules.mak
--- uClibc.orig/Rules.mak	2006-07-05 22:08:23 +0200
+++ uClibc/Rules.mak	2006-07-06 19:02:42 +0200
@@ -5,6 +5,11 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+# check for proper make version
+ifneq ($(findstring 3.7,$(MAKE_VERSION)),)
+$(error Your make is too old $(MAKE_VERSION). Go get at least 3.80)
+endif
+
 #-----------------------------------------------------------
 # This file contains rules which are shared between multiple
 # Makefiles.  All normal configuration options live in the
@@ -81,6 +86,7 @@
 endif
 UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
 NONSHARED_LIBNAME := uclibc_nonshared.a
+NONSHARED_LIBPTNAME := pthread_nonshared.a
 libc := $(top_builddir)lib/$(SHARED_MAJORNAME)
 interp := $(top_builddir)lib/interp.os
 ldso := $(top_builddir)lib/$(UCLIBC_LDSO)


More information about the uClibc mailing list