r1707 - in glibc-package/branches/glibc-2.4/debian: . debhelper.in rules.d
Author: schizo
Date: 2006-08-08 03:30:45 +0000 (Tue, 08 Aug 2006)
New Revision: 1707
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
Log:
Remove some more unneeded nptl stuff
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-08-07 23:48:41 UTC (rev 1706)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-08-08 03:30:45 UTC (rev 1707)
@@ -112,7 +112,6 @@
* Remove mips/cvs-gcc4-sysdeps.diff (merged upstream).
* Update mips/submitted-msq.diff to reflect the new port add-on.
* Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
- * debian/sysdeps/sparc.mk: do an NPTL pass.
* Update any/local-libgcc-compat-{all,others}.diff and split them into
any/local-libgcc-compat-{main,ports}.diff.
* Add sparc/local-fork.diff (use fork.c instead of fork.S).
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install 2006-08-07 23:48:41 UTC (rev 1706)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc-dev.install 2006-08-08 03:30:45 UTC (rev 1707)
@@ -24,5 +24,4 @@
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.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-08-07 23:48:41 UTC (rev 1706)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-08-08 03:30:45 UTC (rev 1707)
@@ -128,29 +128,6 @@
rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
fi
- # /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 ] || \
- ! cmp -s debian/tmp-$(curpass)/$$file debian/tmp-libc/$$file; then \
- target=`echo $$file | sed 's/^usr\/include\///'`; \
- install -d `dirname debian/tmp-libc/usr/include/nptl/$$target`; \
- install -m 644 debian/tmp-$(curpass)/usr/include/$$target \
- debian/tmp-libc/usr/include/nptl/$$target; \
- fi; \
- done; \
- install -d debian/tmp-libc/usr/lib/nptl; \
- 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/\/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/; \
- fi
-
# Create the multidir directories, and the configuration file in /etc/ld.so.conf.d
if [ $(curpass) = libc ]; then \
mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
Reply to: