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

r896 - in glibc-package/branches/glibc-2.3.4/debian: . debhelper.in rules.d



Author: gotom
Date: 2005-04-18 01:54:51 +0000 (Mon, 18 Apr 2005)
New Revision: 896

Modified:
   glibc-package/branches/glibc-2.3.4/debian/changelog
   glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install
   glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk
Log:
    * Support libc6-dev NPTL static libraries
      - debian/rules.d/build.mk: Add installation code from tmp-nptl to
        tmp-libc.
      - debian/debhelper.in/libc-dev.install: Add tmp-libc/usr/lib/nptl*.



Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-16 18:51:22 UTC (rev 895)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog	2005-04-18 01:54:51 UTC (rev 896)
@@ -32,9 +32,11 @@
         work on (ex:) install architecture: i386, kernel architecture: amd64.
       - debian/debhelper.in/libc.postrm: Likewise.
 
-    * Support libc6-dev NPTL headers into /usr/include/nptl:
-      - debian/rules.d/build.mk: Add include file installation code.
-        (Closes: #279423)
+    * Support libc6-dev NPTL static libraries and headers into
+      /usr/lib/nptl and /usr/include/nptl.  (Closes: #276062, #279423)
+      - debian/rules.d/build.mk: Add installation code from tmp-nptl to
+        tmp-libc.
+      - debian/debhelper.in/libc-dev.install: Add tmp-libc/usr/lib/nptl*.
 
  -- GOTO Masanori <gotom@debian.org>  Sun, 10 Apr 2005 14:02:19 +0900
 

Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install	2005-04-16 18:51:22 UTC (rev 895)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/libc-dev.install	2005-04-18 01:54:51 UTC (rev 896)
@@ -23,4 +23,5 @@
 
 debian/tmp-libc/usr/lib/*.o usr/lib
 debian/tmp-libc/usr/lib/*.so usr/lib
+debian/tmp-libc/usr/lib/nptl* usr/lib
 debian/tmp-libc/usr/include/* usr/include

Modified: glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk	2005-04-16 18:51:22 UTC (rev 895)
+++ glibc-package/branches/glibc-2.3.4/debian/rules.d/build.mk	2005-04-18 01:54:51 UTC (rev 896)
@@ -86,7 +86,7 @@
 	  (cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
 	fi
 
-	# /usr/lib/nptl and /usr/include/nptl.  It assumes tmp-libc is already installed.
+	# /usr/include/nptl and /usr/lib/nptl.  It assumes tmp-libc is already installed.
 	if [ $(curpass) = nptl ]; then \
 	  for file in `find debian/tmp-$(curpass)/usr/include -type f | sed 's/^debian\/tmp-nptl\///'`; do \
 	    if ! [ -f debian/tmp-$(curpass)/$$file ] || \
@@ -97,6 +97,16 @@
 			     debian/tmp-libc/usr/include/nptl/$$target; \
 	    fi; \
 	  done; \
+	  install -d debian/tmp-libc/usr/lib/nptl; \
+	  for file in libc.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 \
+	    > debian/tmp-libc/usr/lib/nptl/$$file; \
+	  done; \
+	  ln -sf /lib/tls/librt.so.1 debian/tmp-libc/usr/lib/nptl/; \
 	fi
 
 	$(call xx,extra_install)



Reply to: