another patch for the NPTL branch
Attached.
* debian/debhelper.in/libc-dev.install: ship the kernel asm and linux
headers
* debian/debhelper.in/locales.install: more restrictive wildcards so we
don't accidentally grab the regular file locale.alias; this makes the
binary rule idempotent because dh_link will get confused later
* debian/rules.d/debhelper.mk: fix cut-n-paste typo in nptl
support list generation for dh_install
* debian/sysdeps/ia64.mk: enable NPTL support for IA-64
* debian/debhelper.in/libc-nptl.install: NEW; list of files to install
for NPTL support in libc package
--
Branden Robinson | GPG signed/encrypted mail welcome
branden@progeny.com | 1024D/9C0BCBFB
Progeny Linux Systems | D5F6 D4C9 E25B 3D37 068C
| 72E8 0F42 191A 9C0B CBFB
Index: debian/debhelper.in/libc-dev.install
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/debhelper.in/Attic/libc-dev.install,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 libc-dev.install
--- debian/debhelper.in/libc-dev.install 27 Sep 2003 21:38:09 -0000 1.1.2.2
+++ debian/debhelper.in/libc-dev.install 2 Oct 2003 16:58:37 -0000
@@ -8,3 +8,5 @@
debian/tmp-libc/usr/lib/*.so usr/lib
debian/tmp-libc/usr/include/* usr/include
+linux-kernel-headers/include/asm* usr/include
+linux-kernel-headers/include/linux usr/include
Index: debian/debhelper.in/locales.install
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/debhelper.in/Attic/locales.install,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 locales.install
--- debian/debhelper.in/locales.install 27 Sep 2003 21:38:09 -0000 1.1.2.2
+++ debian/debhelper.in/locales.install 2 Oct 2003 16:58:37 -0000
@@ -1,4 +1,5 @@
-debian/tmp-libc/usr/share/locale/* usr/share/locale
+debian/tmp-libc/usr/share/locale/[a-z][a-z] usr/share/locale
+debian/tmp-libc/usr/share/locale/[a-z][a-z]_[A-Z][A-Z] usr/share/locale
debian/tmp-libc/usr/share/locale/locale.alias etc
debian/tmp-libc/usr/share/i18n/* usr/share/i18n
debian/local/usr_sbin/locale-gen usr/sbin
Index: debian/rules.d/debhelper.mk
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/rules.d/Attic/debhelper.mk,v
retrieving revision 1.1.2.7
diff -u -r1.1.2.7 debhelper.mk
--- debian/rules.d/debhelper.mk 2 Oct 2003 16:14:08 -0000 1.1.2.7
+++ debian/rules.d/debhelper.mk 2 Oct 2003 16:58:37 -0000
@@ -65,7 +65,7 @@
# We probably don't care for now.
for x in $(NPTL); do \
z=debian/$(libc).install; \
- cat debian/debhelper.in/libc-opt.install >>$$z; \
+ cat debian/debhelper.in/libc-nptl.install >>$$z; \
sed -e "s#TMPDIR#debian/tmp-$$x#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
sed -e "s#DESTLIBDIR#tls#" -i $$z; \
Index: debian/sysdeps/ia64.mk
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/sysdeps/Attic/ia64.mk,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 ia64.mk
--- debian/sysdeps/ia64.mk 22 Sep 2003 21:20:58 -0000 1.1.2.1
+++ debian/sysdeps/ia64.mk 2 Oct 2003 16:58:37 -0000
@@ -1 +1,3 @@
+GLIBC_PASSES += nptl
+
libc = libc6.1
--- /dev/null 2003-09-30 15:01:41.000000000 -0500
+++ debian/debhelper.in/libc-nptl.install 2003-10-01 16:41:43.000000000 -0500
@@ -0,0 +1 @@
+debian/tmp-nptl/lib/*.so* lib/nptl
Reply to: