changeset 67:8c075bf475df

Install the libc.so linker script that got built by uClibc. (Just because uClibc's installer does an "rm" on a file doesn't mean it was _there_.)
author Rob Landley <rob@landley.net>
date Thu, 28 Dec 2006 00:09:03 -0500
parents 57f77c25b39d
children fd2cf40fcd02
files sources/patches/uClibc-install.patch
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/sources/patches/uClibc-install.patch	Wed Dec 27 22:32:40 2006 -0500
+++ b/sources/patches/uClibc-install.patch	Thu Dec 28 00:09:03 2006 -0500
@@ -1,6 +1,6 @@
 --- uClibc/Makefile.in	2006-12-14 21:13:04.000000000 -0500
-+++ uClibc-new/Makefile.in	2006-12-27 19:20:35.000000000 -0500
-@@ -207,23 +207,6 @@
++++ uClibc-new/Makefile.in	2006-12-27 23:08:09.000000000 -0500
+@@ -207,21 +207,10 @@
  		$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)$$i.$(MAJOR_VERSION) \
  		$(PREFIX)$(DEVEL_PREFIX)lib/$$i; \
  	done
@@ -11,16 +11,16 @@
 -		    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)lib/$(UCLIBC_LDSO):' \
 -		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)lib/libc.so; \
 -	fi
--ifeq ($(UCLIBC_HAS_THREADS),y)
--ifneq ($(LINUXTHREADS_OLD),y)
++	-$(INSTALL) -m 644 lib/libc.so $(PREFIX)$(DEVEL_PREFIX)lib/
+ ifeq ($(UCLIBC_HAS_THREADS),y)
+ ifneq ($(LINUXTHREADS_OLD),y)
 -	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 )" \
 -			>> $(PREFIX)$(DEVEL_PREFIX)lib/libpthread.so; \
 -	fi
--endif
--endif
++	-$(INSTALL) -m 644 lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)lib/
+ endif
+ endif
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
- 	$(LN) -sf $(RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB)libthread_db.so.1 \
- 		$(PREFIX)$(DEVEL_PREFIX)lib/libthread_db.so