The changes are getting pretty minimal now. * glibc-package/debian/rules.d/control.mk: Pull the architecture-specific package names of the C shared library package into a variable; expand that variable in $(control_deps), and clean the corresponding control files generated during the build process. * glibc-package/debian/sysdeps/ia64.mk: Enable NPTL build on ia64. (Jeff Bailey and I both know this isn't being committed right now due to kernel issues on his IA-64 machine, but he implied I should keep passing it along as a reminder that it needs to be committed eventually.)
-- Branden Robinson | GPG signed/encrypted mail welcome [EMAIL PROTECTED] | 1024D/9C0BCBFB Progeny Linux Systems | D5F6 D4C9 E25B 3D37 068C | 72E8 0F42 191A 9C0B CBFB
Index: glibc-package/debian/rules.d/control.mk =================================================================== RCS file: /cvs/glibc/glibc-package/debian/rules.d/control.mk,v retrieving revision 1.8.2.2 diff -u -r1.8.2.2 control.mk --- glibc-package/debian/rules.d/control.mk 2 Oct 2003 16:14:08 -0000 1.8.2.2 +++ glibc-package/debian/rules.d/control.mk 2 Oct 2003 23:12:35 -0000 @@ -1,4 +1,6 @@ -control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.3 libc1 sparc64 s390x opt) +libc_shlib_names = libc6 libc6.1 libc0.3 libc1 + +control_deps := $(addprefix debian/control.in/, $(libc_shlib_names) sparc64 s390x opt) threads_archs := alpha arm i386 m68k mips mipsel powerpc sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb freebsd-i386 @@ -29,3 +31,6 @@ sed -e '[EMAIL PROTECTED]@%$(libc)%g;[EMAIL PROTECTED]@%glibc%g' \ -e '[EMAIL PROTECTED]@%$(threads_archs)%g' < [EMAIL PROTECTED] > $@ rm [EMAIL PROTECTED] + +clean:: + rm -f $(patsubst %,debian/control.in/%,$(libc_shlib_names)) Index: glibc-package/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 --- glibc-package/debian/sysdeps/ia64.mk 22 Sep 2003 21:20:58 -0000 1.1.2.1 +++ glibc-package/debian/sysdeps/ia64.mk 2 Oct 2003 23:12:35 -0000 @@ -1 +1,3 @@ +GLIBC_PASSES += nptl + libc = libc6.1