r3819 - in glibc-package/branches/eglibc-2.10/debian: . control.in debhelper.in local/manpages patches/kfreebsd rules.d sysdeps
Author: aurel32
Date: 2009-09-08 20:21:56 +0000 (Tue, 08 Sep 2009)
New Revision: 3819
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/control
glibc-package/branches/eglibc-2.10/debian/control.in/main
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-pic.dirs
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-prof.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-udeb.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian-overrides
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-dns-udeb.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-files-udeb.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/nscd.init
glibc-package/branches/eglibc-2.10/debian/local/manpages/nscd.conf.5
glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/eglibc-2.10/debian/rules
glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
glibc-package/branches/eglibc-2.10/debian/sysdeps/amd64.mk
Log:
Merge from unstable, revisions 3788-3818
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-09-08 20:21:56 UTC (rev 3819)
@@ -126,6 +126,34 @@
-- Aurelien Jarno <aurel32@debian.org> Tue, 18 Aug 2009 21:39:16 +0200
+eglibc (2.9-27) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Extend description of libc-bin, patch by Christoph Berg. Closes:
+ bug#544389.
+ * Strip *.o files manually (dh_strip does not do it) to prevent
+ leakage of the build directory.
+ * libc.postinst: re-add "telinit u", removed by accident in version
+ 2.9-24. Closes: bug#545179.
+ * nscd.init: set PATH to "/sbin:/usr/sbin:/bin:/usr/bin". Closes:
+ bug#544942.
+ * nscd.conf.5: add documentation for max-db-size and auto-propagate
+ options. Closes: bug#544544.
+ * Merge from the multiarch branch:
+ - allow to specify libdir and slibdir also for the main flavor.
+ - use real dependencies between the build_* and binaryinst_*
+ targets.
+ - simplify clean target.
+
+ [ Samuel Thibault ]
+ * debian/debhelper.in/libc.install: Install libc/*-gnu*/ instead of
+ libc/*-*-gnu*/, to fix FTBFS on hurd-i386 due to it now being i486-gnu/.
+
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2779 (from glibc-bsd).
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 07 Sep 2009 20:49:08 +0200
+
eglibc (2.9-26) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.10/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/control 2009-09-08 20:21:56 UTC (rev 3819)
@@ -23,7 +23,16 @@
Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
- This package contains utility programs related to the GNU C Library.
+ This package contains utility programs related to the GNU C Library.
+ .
+ * catchsegv: catch segmentation faults in programs
+ * getconf: query system configuration variables
+ * getent: get entries from administrative databases
+ * iconv, iconvconfig: convert between character encodings
+ * ldd, ldconfig: print/configure shared library dependencies
+ * locale, localedef: show/generate locale definitions
+ * rpcinfo: report RPC information
+ * tzselect, zdump, zic: select/dump/compile time zones
Package: libc-dev-bin
Architecture: any
Modified: glibc-package/branches/eglibc-2.10/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control.in/main 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/control.in/main 2009-09-08 20:21:56 UTC (rev 3819)
@@ -23,7 +23,16 @@
Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Binaries
- This package contains utility programs related to the GNU C Library.
+ This package contains utility programs related to the GNU C Library.
+ .
+ * catchsegv: catch segmentation faults in programs
+ * getconf: query system configuration variables
+ * getent: get entries from administrative databases
+ * iconv, iconvconfig: convert between character encodings
+ * ldd, ldconfig: print/configure shared library dependencies
+ * locale, localedef: show/generate locale definitions
+ * rpcinfo: report RPC information
+ * tzselect, zdump, zic: select/dump/compile time zones
Package: libc-dev-bin
Architecture: any
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,22 +1,21 @@
-debian/tmp-libc/usr/lib/libanl.a usr/lib
-debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
-debian/tmp-libc/usr/lib/libbsd-compat.a usr/lib
-debian/tmp-libc/usr/lib/libc.a usr/lib
-debian/tmp-libc/usr/lib/libc_nonshared.a usr/lib
-debian/tmp-libc/usr/lib/libcrypt.a usr/lib
-debian/tmp-libc/usr/lib/libdl.a usr/lib
-debian/tmp-libc/usr/lib/libg.a usr/lib
-debian/tmp-libc/usr/lib/libieee.a usr/lib
-debian/tmp-libc/usr/lib/libm.a usr/lib
-debian/tmp-libc/usr/lib/libmcheck.a usr/lib
-debian/tmp-libc/usr/lib/libnsl.a usr/lib
-debian/tmp-libc/usr/lib/libpthread.a usr/lib
-debian/tmp-libc/usr/lib/libpthread_nonshared.a usr/lib
-debian/tmp-libc/usr/lib/libresolv.a usr/lib
-debian/tmp-libc/usr/lib/librpcsvc.a usr/lib
-debian/tmp-libc/usr/lib/librt.a usr/lib
-debian/tmp-libc/usr/lib/libutil.a usr/lib
-
-debian/tmp-libc/usr/lib/*.o usr/lib
-debian/tmp-libc/usr/lib/*.so usr/lib
-debian/tmp-libc/usr/include/* usr/include
+TMPDIR/LIBDIR/libanl.a LIBDIR
+TMPDIR/LIBDIR/libBrokenLocale.a LIBDIR
+TMPDIR/LIBDIR/libbsd-compat.a LIBDIR
+TMPDIR/LIBDIR/libc.a LIBDIR
+TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libcrypt.a LIBDIR
+TMPDIR/LIBDIR/libdl.a LIBDIR
+TMPDIR/LIBDIR/libg.a LIBDIR
+TMPDIR/LIBDIR/libieee.a LIBDIR
+TMPDIR/LIBDIR/libm.a LIBDIR
+TMPDIR/LIBDIR/libmcheck.a LIBDIR
+TMPDIR/LIBDIR/libnsl.a LIBDIR
+TMPDIR/LIBDIR/libpthread.a LIBDIR
+TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
+TMPDIR/LIBDIR/libresolv.a LIBDIR
+TMPDIR/LIBDIR/librpcsvc.a LIBDIR
+TMPDIR/LIBDIR/librt.a LIBDIR
+TMPDIR/LIBDIR/libutil.a LIBDIR
+TMPDIR/LIBDIR/*.o LIBDIR
+TMPDIR/LIBDIR/*.so LIBDIR
+TMPDIR/usr/include/* usr/include
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-pic.dirs
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-pic.dirs 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-pic.dirs 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1 +1 @@
-usr/lib/libc_pic
+LIBDIR/libc_pic
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-prof.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-prof.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-prof.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1 +1 @@
-debian/tmp-libc/usr/lib/*_p.a usr/lib
+TMPDIR/LIBDIR/*_p.a LIBDIR
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-udeb.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-udeb.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,13 +1,13 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/ld*.so* lib
-debian/tmp-libc/lib/libm-*.so* lib
-debian/tmp-libc/lib/libm.so* lib
-debian/tmp-libc/lib/libdl*.so* lib
-debian/tmp-libc/lib/libresolv*.so* lib
-debian/tmp-libc/lib/libc-*.so* lib
-debian/tmp-libc/lib/libc.so* lib
-debian/tmp-libc/lib/libutil* lib
-debian/tmp-libc/lib/libcrypt* lib
-debian/tmp-libc/lib/librt*.so* lib
-debian/tmp-libc/lib/libpthread*.so* lib
+TMPDIR/SLIBDIR/ld*.so* lib
+TMPDIR/SLIBDIR/libm-*.so* lib
+TMPDIR/SLIBDIR/libm.so* lib
+TMPDIR/SLIBDIR/libdl*.so* lib
+TMPDIR/SLIBDIR/libresolv*.so* lib
+TMPDIR/SLIBDIR/libc-*.so* lib
+TMPDIR/SLIBDIR/libc.so* lib
+TMPDIR/SLIBDIR/libutil* lib
+TMPDIR/SLIBDIR/libcrypt* lib
+TMPDIR/SLIBDIR/librt*.so* lib
+TMPDIR/SLIBDIR/libpthread*.so* lib
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,10 +1,7 @@
-debian/tmp-libc/lib/*.so* lib
-debian/tmp-libc/usr/lib/gconv/*.so usr/lib/gconv
-debian/tmp-libc/usr/lib/gconv/gconv-modules usr/lib/gconv
+TMPDIR/SLIBDIR/*.so* SLIBDIR
+TMPDIR/LIBDIR/gconv/*.so LIBDIR/gconv
+TMPDIR/LIBDIR/gconv/gconv-modules LIBDIR/gconv
-debian/tmp-libc/lib/*-*-gnu*/ lib
-debian/tmp-libc/usr/lib/*-*-gnu*/ usr/lib
+TMPDIR/etc/ld.so.conf.d /etc
-debian/tmp-libc/etc/ld.so.conf.d /etc
-
BUILD-TREE/test-results-*-libc usr/share/doc/LIBC
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian-overrides
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian-overrides 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian-overrides 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,13 +1,13 @@
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
-LIBC: unstripped-binary-or-object ./lib/libpthread-2.10.1.so
+LIBC: unstripped-binary-or-object .SLIBDIR/libpthread-2.10.1.so
# ld.so must be executable, otherwise the system will not work
-LIBC: shlib-with-executable-bit lib/ld-2.10.1.so 0755
+LIBC: shlib-with-executable-bit SLIBDIR/ld-2.10.1.so 0755
# It is normal that the ELF dynamic linker does not need any other
# library
-LIBC: shared-lib-without-dependency-information ./lib/ld-2.10.1.so
+LIBC: shared-lib-without-dependency-information .SLIBDIR/ld-2.10.1.so
# dependency on debconf is not needed, as glibc has a fallback to tty
LIBC: missing-debconf-dependency-for-preinst
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst 2009-09-08 20:21:56 UTC (rev 3819)
@@ -204,6 +204,12 @@
# Generate cache file /usr/lib/gconv/gconv-modules.cache
iconvconfig || true
+
+ if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+ # the devicenumber/inode pair of / is the same as that of /sbin/init's
+ # root, so we're *not* in a chroot
+ (telinit u ; sleep 1)
+ fi
fi
#DEBHELPER#
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst 2009-09-08 20:21:56 UTC (rev 3819)
@@ -197,7 +197,7 @@
if [ "$type" != abort-upgrade ]
then
- ldbytes=`head -c 20 RTLD | od -c`
+ ldbytes=`head -c 20 RTLD_SO | od -c`
dirs="/lib32 /lib64 /usr/local/lib /usr/local/lib32 /usr/local/lib64"
if ! test -L /usr; then
dirs="$dirs /usr/lib /usr/lib32 /usr/lib64"
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-dns-udeb.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-dns-udeb.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-dns-udeb.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_dns*.so* lib
+TMPDIR/SLIBDIR/libnss_dns*.so* lib
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-files-udeb.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-files-udeb.install 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libnss-files-udeb.install 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_files*.so* lib
+TMPDIR/SLIBDIR/libnss_files*.so* lib
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/nscd.init 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/nscd.init 2009-09-08 20:21:56 UTC (rev 3819)
@@ -16,8 +16,7 @@
# query. You should start this daemon only if you use
# slow Services like NIS or NIS+
-# Sanity checks.
-
+PATH="/sbin:/usr/sbin:/bin:/usr/bin"
NAME="nscd"
DESC="Name Service Cache Daemon"
DAEMON="/usr/sbin/nscd"
Modified: glibc-package/branches/eglibc-2.10/debian/local/manpages/nscd.conf.5
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/local/manpages/nscd.conf.5 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/local/manpages/nscd.conf.5 2009-09-08 20:21:56 UTC (rev 3819)
@@ -199,6 +199,18 @@
.BR nscd (8)
will either reload it (query the NSS service again if the data hasn't changed), or
drop it.
+.TP
+.BI max-db-size \ service\ number-of-bytes
+Sets the maximum allowable size for the service.
+.TP
+.BI auto-propagate \ service\ bool
+When set to no for passwd or group service, then the
+.I .byname
+requests are not added to
+.I passwd.byuid
+or
+.I group.bygid
+cache. This may help for tables containing multiple records for the same id.
.SH EXAMPLE
.nf
Modified: glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-09-08 20:21:56 UTC (rev 3819)
@@ -8289,7 +8289,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c
-@@ -0,0 +1,163 @@
+@@ -0,0 +1,164 @@
+/* Test for access to file, relative to open directory. Linux version.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -8453,9 +8453,10 @@
+ __set_errno (EACCES);
+ return -1;
+}
++stub_warning(faccessat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchmodat.c
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8586,9 +8587,10 @@
+ return __chmod(file, mode);
+#endif
+}
++stub_warning(fchmodat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchownat.c
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,130 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8718,13 +8720,14 @@
+ return __chown(file, owner, group);
+#endif
+}
++stub_warning(fchownat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fcntl.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/fcntl.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fexecve.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,104 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8828,6 +8831,7 @@
+ return -1;
+#endif
+}
++stub_warning(fexecve)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fhstat.c
@@ -0,0 +1,40 @@
@@ -9221,7 +9225,7 @@
+/* 'ftruncate64' is the same as 'ftruncate', because __off64_t == __off_t. */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/futimesat.c
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9352,6 +9356,7 @@
+ return __utimes(file, tvp);
+#endif
+}
++stub_warning(futimesat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstat.c
@@ -0,0 +1,48 @@
@@ -9452,7 +9457,7 @@
+hidden_def (__fxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat.c
-@@ -0,0 +1,150 @@
+@@ -0,0 +1,151 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9603,9 +9608,10 @@
+}
+
+libc_hidden_def (__fxstatat)
++stub_warning(fstatat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat64.c
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,145 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9750,6 +9756,7 @@
+}
+
+libc_hidden_def (__fxstatat64)
++stub_warning(fstatat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c
@@ -0,0 +1,91 @@
@@ -11100,7 +11107,7 @@
+/* State of this thread when the signal was taken.
+ The unions below are for compatibility with Linux (whose sigcontext
+ components don't have sc_ prefix) */
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ int sc_onstack; /* Nonzero if running on sigstack. */
@@ -14635,7 +14642,7 @@
+#endif /* ldsodefs.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linkat.c
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,172 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -14807,6 +14814,7 @@
+ return __link (from, to);
+#endif
+}
++stub_warning(linkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/Implies
@@ -0,0 +1 @@
@@ -15552,7 +15560,7 @@
+hidden_def (__lxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mkdirat.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,119 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15671,6 +15679,7 @@
+ return __mkdir (file, mode);
+#endif
+}
++stub_warning(mkdirat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c
@@ -0,0 +1,86 @@
@@ -16871,7 +16880,7 @@
+#endif /* netinet/ip_icmp.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/netinet/tcp.h
-@@ -0,0 +1,258 @@
+@@ -0,0 +1,267 @@
+/* netinet/tcp.h
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -16926,6 +16935,7 @@
+#define _NETINET_TCP_H 1
+
+#include <features.h>
++#include <sys/queue.h>
+
+/*
+ * User-settable options (used with setsockopt).
@@ -16934,13 +16944,21 @@
+#define TCP_MAXSEG 2 /* Set maximum segment size */
+#define TCP_NOPUSH 4 /* Don't push last block of write */
+#define TCP_NOOPT 8 /* Don't use TCP options */
++#define TCP_MD5SIG 16 /* use MD5 digests (RFC2385) */
++#define TCP_INFO 32 /* retrieve tcp_info structure */
++#define TCP_CONGESTION 64 /* get/set congestion control algorithm */
+
+#ifdef __USE_MISC
+# include <sys/types.h>
+
-+# ifdef __FAVOR_BSD
+typedef u_int32_t tcp_seq;
+typedef u_int32_t tcp_cc; /* connection count, per RFC 1644 */
++
++/* Miscellaneous constants */
++#define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */
++#define TCP_MAX_SACK 4 /* MAX # SACKs sent in any segment */
++
++# ifdef __FAVOR_BSD
+/*
+ * TCP header.
+ * Per RFC 793, September, 1981.
@@ -17647,7 +17665,7 @@
+strong_alias (__open_2, __open64_2)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat.c
-@@ -0,0 +1,294 @@
+@@ -0,0 +1,296 @@
+/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -17942,6 +17960,8 @@
+}
+
+strong_alias (__openat_2, __openat64_2)
++stub_warning(openat)
++stub_warning(openat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat64.c
@@ -0,0 +1,2 @@
@@ -18443,7 +18463,7 @@
+weak_alias (__readdir64_r, readdir64_r)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readlinkat.c
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,123 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -18566,6 +18586,7 @@
+}
+
+libc_hidden_def (readlinkat)
++stub_warning(readlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readonly-area.c
@@ -0,0 +1,96 @@
@@ -18771,7 +18792,7 @@
+LIBC_CANCEL_HANDLED (); /* in __libc_recvfrom */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/renameat.c
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,165 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -18936,6 +18957,7 @@
+ return __rename (old, new);
+#endif
+}
++stub_warning(renameat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/rtld-lowlevel.h
@@ -0,0 +1,131 @@
@@ -20457,7 +20479,7 @@
+#include <misc/stty.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/symlinkat.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,119 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -20576,6 +20598,7 @@
+ return __symlink (from, to);
+#endif
+}
++stub_warning(symlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h
@@ -0,0 +1,25 @@
@@ -22941,7 +22964,7 @@
+libc_hidden_def (uname)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlinkat.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,128 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -23069,6 +23092,7 @@
+ return __unlink (file);
+#endif
+}
++stub_warning(unlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlockpt.c
@@ -0,0 +1,45 @@
@@ -24269,7 +24293,7 @@
+/* State of this thread when the signal was taken.
+ The unions below are for compatibility with Linux (whose sigcontext
+ components don't have sc_ prefix) */
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ int sc_onstack; /* Nonzero if running on sigstack. */
@@ -24338,7 +24362,7 @@
+
+#else
+
-+struct sigcontext
++__extension__ struct sigcontext
+ {
+ __sigset_t sc_mask; /* Blocked signals to restore. */
+ long sc_onstack; /* Nonzero if running on sigstack. */
@@ -26532,7 +26556,7 @@
+weak_alias (__xmknod, _xmknod)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xmknodat.c
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,138 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -26670,6 +26694,7 @@
+}
+
+libc_hidden_def (__xmknodat)
++stub_warning(xmknodat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xstat.c
@@ -0,0 +1,49 @@
Modified: glibc-package/branches/eglibc-2.10/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/rules 2009-09-08 20:21:56 UTC (rev 3819)
@@ -44,10 +44,10 @@
export SHELL = /bin/bash -e
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -89,6 +89,8 @@
docdir=$(prefix)/share/doc
mandir=$(prefix)/share/man
sbindir=$(prefix)/sbin
+slibdir=/lib
+libdir=/usr/lib
BUILD_CC = gcc
BUILD_CXX = g++
@@ -152,7 +154,7 @@
# And now the rules...
include debian/rules.d/*.mk
-clean:: unpatch debhelper-clean
+clean:: unpatch
make -C $(CURDIR)/linuxthreads/man clean
rm -f $(CURDIR)/po/*.mo
rm -rf $(patsubst %,debian/tmp-%,$(EGLIBC_PASSES))
@@ -162,12 +164,9 @@
# Required Debian targets
binary-indep: build testroot debian/control $(build-tree) \
- $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_INDEP_REGULAR_PACKAGES))
-# NOTE: Putting install_ stamps before binaryinst_ stamps in the list is the
-# wrong way to represent dependencies. Fix this.
+
binary-arch: build testroot debian/control $(build-tree) \
- $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES)) \
$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES))
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-09-08 20:21:56 UTC (rev 3819)
@@ -43,12 +43,8 @@
echo "docdir = $(docdir)" >> $(DEB_BUILDDIR)/configparms
echo "mandir = $(mandir)" >> $(DEB_BUILDDIR)/configparms
echo "sbindir = $(sbindir)" >> $(DEB_BUILDDIR)/configparms
- libdir="$(call xx,libdir)" ; if test -n "$$libdir" ; then \
- echo "libdir = $$libdir" >> $(DEB_BUILDDIR)/configparms ; \
- fi
- slibdir="$(call xx,slibdir)" ; if test -n "$$slibdir" ; then \
- echo "slibdir = $$slibdir" >> $(DEB_BUILDDIR)/configparms ; \
- fi
+ echo "libdir = $(call xx,libdir)" >> $(DEB_BUILDDIR)/configparms
+ echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms
rtlddir="$(call xx,rtlddir)" ; if test -n "$$rtlddir" ; then \
echo "rtlddir = $$rtlddir" >> $(DEB_BUILDDIR)/configparms ; \
fi
@@ -142,7 +138,7 @@
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
fi
- # Create the multidir directories, and the configuration file in /etc/ld.so.conf.d
+ # Create the multiarch 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; \
machine=`sed '/^ *config-machine *=/!d;s/.*= *//g' $(DEB_BUILDDIR)/config.make`; \
@@ -167,5 +163,3 @@
-f $(build-tree)/eglibc-$(EGLIBC_VERSION).tar.lzma \
$(EGLIBC_SOURCES)
touch $@
-
-.NOTPARALLEL: $(patsubst %,install_%,$(EGLIBC_PASSES))
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-09-08 20:21:56 UTC (rev 3819)
@@ -2,19 +2,19 @@
# renames. There's very little we can do for now. Maybe after
# Sarge releases we can consider breaking packages, but certainly not now.
-$(stamp)binaryinst_$(libc)-pic:: $(stamp)debhelper
+$(stamp)binaryinst_$(libc)-pic:: debhelper
@echo Running special kludge for $(libc)-pic
dh_testroot
dh_installdirs -p$(curpass)
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc.map debian/$(libc)-pic/usr/lib/libc_pic.map
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/soinit.os debian/$(libc)-pic/usr/lib/libc_pic/soinit.o
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/sofini.os debian/$(libc)-pic/usr/lib/libc_pic/sofini.o
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc_pic.a debian/$(libc)-pic/$(libdir)/.
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libc.map debian/$(libc)-pic/$(libdir)/libc_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/soinit.os debian/$(libc)-pic/$(libdir)/libc_pic/soinit.o
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/elf/sofini.os debian/$(libc)-pic/$(libdir)/libc_pic/sofini.o
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/math/libm_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libm.map debian/$(libc)-pic/usr/lib/libm_pic.map
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/resolv/libresolv_pic.a debian/$(libc)-pic/usr/lib/.
- install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/usr/lib/libresolv_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/math/libm_pic.a debian/$(libc)-pic/$(libdir)/.
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libm.map debian/$(libc)-pic/$(libdir)/libm_pic.map
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/resolv/libresolv_pic.a debian/$(libc)-pic/$(libdir)/.
+ install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/$(libdir)/libresolv_pic.map
# Some per-package extra files to install.
define libc-bin_extra_debhelper_pkg_install
@@ -32,7 +32,7 @@
non-debug-packages = $(filter-out %-dbg,$(DEB_ARCH_REGULAR_PACKAGES))
$(patsubst %,$(stamp)binaryinst_%,$(debug-packages)):: $(patsubst %,$(stamp)binaryinst_%,$(non-debug-packages))
-$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)):: $(stamp)debhelper
+$(patsubst %,$(stamp)binaryinst_%,$(DEB_ARCH_REGULAR_PACKAGES) $(DEB_INDEP_REGULAR_PACKAGES)):: $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES)) debhelper
@echo Running debhelper for $(curpass)
dh_testroot
dh_installdirs -p$(curpass)
@@ -112,7 +112,7 @@
touch $@
$(patsubst %,binaryinst_%,$(DEB_UDEB_PACKAGES)) :: binaryinst_% : $(stamp)binaryinst_%
-$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): $(stamp)debhelper
+$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): debhelper $(patsubst %,$(stamp)install_%,$(EGLIBC_PASSES))
@echo Running debhelper for $(curpass)
dh_testroot
dh_installdirs -p$(curpass)
@@ -135,66 +135,25 @@
touch $@
-OPT_PASSES = $(filter-out libc, $(EGLIBC_PASSES))
-OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
-
-debhelper: $(stamp)debhelper
-$(stamp)debhelper:
+debhelper: $(stamp)debhelper-common $(patsubst %,$(stamp)debhelper_%,$(EGLIBC_PASSES))
+$(stamp)debhelper-common:
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
- z=`echo $$y | sed -e 's#libc\(\|-alt\|-dev\|-dev-alt\|-otherbuild\|-pic\|-prof\|-udeb\)\.#$(libc)\1.#g'`; \
- cp $$x $$z; \
- sed -e "s#BUILD-TREE#$(build-tree)#" -i $$z; \
- sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$z; \
- sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$z; \
- sed -e "s#LIBC#$(libc)#" -i $$z; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$z; \
- sed -e "s#EXIT_CHECK##" -i $$z; \
- sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$z; \
- case $$z in \
+ cp $$x $$y; \
+ sed -e "s#BUILD-TREE#$(build-tree)#" -i $$y; \
+ sed -e "s#LIBC#$(libc)#" -i $$y; \
+ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$y; \
+ sed -e "s#EXIT_CHECK##" -i $$y; \
+ sed -e "s#DEB_HOST_ARCH#$(DEB_HOST_ARCH)#" -i $$y; \
+ sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$y; \
+ sed -e "/NOHWCAP/r debian/script.in/nohwcap.sh" -i $$y; \
+ case $$y in \
*.install) \
- sed -e "s/^#.*//" -i $$z ; \
+ sed -e "s/^#.*//" -i $$y ; \
;; \
- debian/$(libc).preinst) \
- rtld=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
- c_so=`ls debian/tmp-libc/lib/ | grep "libc\.so\."` ; \
- m_so=`ls debian/tmp-libc/lib/ | grep "libm\.so\."` ; \
- pthread_so=`ls debian/tmp-libc/lib/ | grep "libpthread\.so\."` || true; \
- rt_so=`ls debian/tmp-libc/lib/ | grep "librt\.so\."` ; \
- dl_so=`ls debian/tmp-libc/lib/ | grep "libdl\.so\."` ; \
- sed -e "s#RTLD#$$rtld#" -e "s#C_SO#$$c_so#" -e "s#M_SO#$$m_so#" -e "s#PTHREAD_SO#$$pthread_so#" -e "s#RT_SO#$$rt_so#" -e "s#DL_SO#$$dl_so#" -i $$z ; \
- ;; \
esac; \
done
- # Hack: special-case passes whose destdir is a biarch directory
- # to use a different install template, which includes more
- # libraries. Also generate a -dev. Other libraries get scripts
- # to temporarily disable hwcap. This needs some cleaning up.
- set -- $(OPT_DIRS); \
- for x in $(OPT_PASSES); do \
- slibdir=$$1; \
- shift; \
- case $$slibdir in \
- /lib32 | /lib64) \
- suffix="alt"; \
- libdir=$$1; \
- shift; \
- ;; \
- *) \
- suffix="otherbuild"; \
- ;; \
- esac; \
- for y in debian/$(libc)*-$$suffix.* ; do \
- z=`echo $$y | sed -e "s/$$suffix/$$x/"` ; \
- cp $$y $$z ; \
- sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$z; \
- sed -e "s#SLIBDIR#$$slibdir#g" -i $$z; \
- sed -e "s#LIBDIR#$$libdir#g" -i $$z; \
- sed -e "s#FLAVOR#$$x#g" -i $$z; \
- done ; \
- done
-
# Substitute __PROVIDED_LOCALES__.
perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__PROVIDED_LOCALES__/$$j/g;' debian/locales.config debian/locales.postinst
@@ -207,9 +166,58 @@
done
rm -f tmp.substvars
- touch $(stamp)debhelper
+ touch $@
-debhelper-clean:
+$(patsubst %,debhelper_%,$(EGLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_%
+$(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
+ libdir=$(call xx,libdir) ; \
+ slibdir=$(call xx,slibdir) ; \
+ curpass=$(curpass) ; \
+ c_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libc\.so\."` ; \
+ m_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libm\.so\."` ; \
+ rt_so=`ls debian/tmp-$$curpass/$$slibdir | grep "librt\.so\."` ; \
+ dl_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libdl\.so\."` ; \
+ rtld_so=`LANG=C LC_ALL=C readelf -l debian/tmp-$$curpass/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
+ pthread_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libpthread\.so\."` || true; \
+ case "$$curpass:$$slibdir" in \
+ libc:*) \
+ templates="libc libc-dev libc-pic libc-prof libc-udeb libnss-dns-udeb libnss-files-udeb" \
+ pass="" \
+ suffix="" \
+ ;; \
+ *:/lib32 | *:/lib64) \
+ templates="libc libc-dev" \
+ pass="-alt" \
+ suffix="-$(curpass)" \
+ ;; \
+ *:*) \
+ templates="libc" \
+ pass="-otherbuild" \
+ suffix="-$(curpass)" \
+ ;; \
+ esac ; \
+ for t in $$templates ; do \
+ for s in debian/$$t$$pass.* ; do \
+ t=`echo $$s | sed -e "s#libc\(.*\)$$pass#$(libc)\1$$suffix#"` ; \
+ if [ "$$s" != "$$t" ] ; then \
+ cp $$s $$t ; \
+ fi ; \
+ sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \
+ sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \
+ sed -e "s#LIBDIR#$$libdir#g" -i $$t; \
+ sed -e "s#FLAVOR#$$curpass#g" -i $$t; \
+ sed -e "s#C_SO#$$c_so#" -i $$t ; \
+ sed -e "s#M_SO#$$m_so#" -i $$t ; \
+ sed -e "s#RT_SO#$$rt_so#" -i $$t ; \
+ sed -e "s#DL_SO#$$dl_so#" -i $$t ; \
+ sed -e "s#RTLD_SO#$$rtld_so#" -i $$t ; \
+ sed -e "s#PTHREAD_SO#$$pthread_so#" -i $$t ; \
+ done ; \
+ done
+
+ touch $@
+
+clean::
dh_clean
rm -f debian/*.install*
Modified: glibc-package/branches/eglibc-2.10/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/sysdeps/amd64.mk 2009-09-08 19:52:02 UTC (rev 3818)
+++ glibc-package/branches/eglibc-2.10/debian/sysdeps/amd64.mk 2009-09-08 20:21:56 UTC (rev 3819)
@@ -1,5 +1,3 @@
-libc_slibdir = /lib
-libc_libdir = /usr/lib
libc_rtlddir = /lib64
# /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302.
Reply to: