[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1191 - in glibc-package/trunk/debian: . rules.d



Author: aurel32
Date: 2006-02-19 01:06:47 +0000 (Sun, 19 Feb 2006)
New Revision: 1191

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/rules.d/build.mk
Log:
  * Install libc_nonshared.a in /usr/lib/nptl, and fix the location 
    of the static libraries of the NPTL ld scripts. (Closes: #347762)



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-02-18 23:48:02 UTC (rev 1190)
+++ glibc-package/trunk/debian/changelog	2006-02-19 01:06:47 UTC (rev 1191)
@@ -44,6 +44,8 @@
     arguments) from Samuel Thibault.  (Closes: #320273)
   * Fix the prototype of sbrk() in the manual.  (Closes: #281863)
   * Fix the strcasestr() examples in the manual.  (Closes: #289853)
+  * Install libc_nonshared.a in /usr/lib/nptl, and fix the location 
+    of the static libraries of the NPTL ld scripts. (Closes: #347762)
 
  -- Clint Adams <schizo@debian.org>  Sun, 12 Feb 2006 11:04:38 -0500
 

Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk	2006-02-18 23:48:02 UTC (rev 1190)
+++ glibc-package/trunk/debian/rules.d/build.mk	2006-02-19 01:06:47 UTC (rev 1191)
@@ -111,12 +111,12 @@
 	    fi; \
 	  done; \
 	  install -d debian/tmp-libc/usr/lib/nptl; \
-	  for file in libc.a libpthread.a libpthread_nonshared.a librt.a; do \
+	  for file in libc.a libc_nonshared.a libpthread.a libpthread_nonshared.a librt.a; do \
 	    install -m 644 debian/tmp-$(curpass)/usr/lib/$$file \
 			   debian/tmp-libc/usr/lib/nptl/$$file; \
 	  done; \
 	  for file in libc.so libpthread.so; do \
-	    sed 's/\/lib\//\/lib\/tls\//g' < debian/tmp-$(curpass)/usr/lib/$$file \
+	    sed 's/ \/lib\// \/lib\/tls\//g;s/\/usr\/lib\//\/usr\/lib\/nptl\//g' < debian/tmp-$(curpass)/usr/lib/$$file \
 	    > debian/tmp-libc/usr/lib/nptl/$$file; \
 	  done; \
 	  ln -sf /lib/tls/librt.so.1 debian/tmp-libc/usr/lib/nptl/; \



Reply to: