Author: aurel32 Date: 2011-02-26 20:28:09 +0000 (Sat, 26 Feb 2011) New Revision: 4548
Added: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sched_h.diff glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-if_freereq.diff Removed: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff Modified: glibc-package/branches/eglibc-2.13/debian/changelog glibc-package/branches/eglibc-2.13/debian/control glibc-package/branches/eglibc-2.13/debian/control.in/main glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff glibc-package/branches/eglibc-2.13/debian/patches/series glibc-package/branches/eglibc-2.13/debian/rules glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/amd64.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/hurd-i386.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/i386.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/mips.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/mipsel.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/powerpc.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/ppc64.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/s390.mk glibc-package/branches/eglibc-2.13/debian/sysdeps/sparc.mk Log: Merge 2.11.2-12 changes Modified: glibc-package/branches/eglibc-2.13/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-26 20:28:09 UTC (rev 4548) @@ -12,7 +12,6 @@ - Provide POSIX2008 compliant futimens(). Closes: #563724. - Fix auxilary cache file creation. Closes: 588218. - Fix POSIX2008 compliance. Closes: #610824. - - Fix qsort_r() crashes. Closes: #614892. - Update patches/locale/locale-print-LANGUAGE.diff. - Update patches/localedata/sort-UTF8-first.diff. - Remove patches/localedata/submitted-pt_BR.diff (merged upstream). @@ -83,6 +82,8 @@ - Remove patches/any/cvs-audit-suid.diff (merged upstream). - Remove patches/any/cvs-dont-expand-dst-twice.diff (merged upstream). - Remove patches/any/cvs-ignore-origin-privileged.diff (merged upstream). + - Remove patches/any/cvs-fnmatch-alloca.diff (merged upstream). + - Remove patches/any/cvs-qsort-race.diff from upstream (merged upstream). - Remove patches/any/submitted-etc-resolv.conf.diff (obsolete). - Update patches/any/submitted-bits-fcntl_h-at.diff. - Remove patches/any/submitted-nis-shadow.diff (obsolete). @@ -111,8 +112,6 @@ in pthread_rwlock_timedrdlock() and pthread_rwlock_timedwrlock(). * Whitelist tst-makecontext3.out test on ia64, as it is new and can't succeed on this architecture. - * debian/quiltrc: use new option "--reject-format=unified" instead of - "--unified-reject-files". Closes: #612540. * Build depends on binutils (>= 2.21) on sparc and sparc64 to gain STT_GNU_IFUNC support. * Add patches/any/submitted-ldsodefs_rtld_debug.diff to fix @@ -138,6 +137,35 @@ -- Aurelien Jarno <aure...@debian.org> Mon, 21 Feb 2011 02:35:57 +0000 +eglibc (2.11.2-12) unstable; urgency=medium + + [ Aurelien Jarno ] + * Re-enable build failure in case of testsuite regressions. + * Add patches/any/cvs-fnmatch-alloca.patch from upstream to fix a + memory corruption in fnmatch() that can lead to code execution. + Closes: #615120. + * Add patches/any/cvs-qsort-race.diff from upstream to fix race in + qsort_r(). Closes: #614892. + + [ Samuel Thibault ] + * patches/any/submitted-sched_h.diff: Synchronize bits/sched.h with + sysdeps/unix/sysv/linux/bits/sched.h (Closes: #527589), rename to + cvs-sched_h.diff. + * patches/hurd-i386/cvs-if_freereq.diff: Fix crash when siocgifconf + actually succeeds. + + [ Clint Adams ] + * Patch from Nobuhiro Iwamatsu to cope with the removal of + patch --unified-reject-files. closes: #612540. + + [ Steve Langasek ] + * Merge parts of multiarch patch: + - Use the correct path in the ldd script as well + - Set default rtlddir to /lib and override it when needed. + - Install xen library in $(libdir)/xen instead of /usr/lib/xen. + + -- Aurelien Jarno <aure...@debian.org> Sat, 26 Feb 2011 18:28:26 +0100 + eglibc (2.11.2-11) unstable; urgency=low * patches/kfreebsd/local-sysdeps.diff: remove stub marks for at* Modified: glibc-package/branches/eglibc-2.13/debian/control =================================================================== --- glibc-package/branches/eglibc-2.13/debian/control 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/control 2011-02-26 20:28:09 UTC (rev 4548) @@ -10,7 +10,7 @@ g++-4.4 (>= 4.4.2-2), g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc] Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> -Uploaders: GOTO Masanori <go...@debian.org>, Jeff Bailey <jbai...@raspberryginger.com>, Daniel Jacobowitz <d...@debian.org>, Clint Adams <sch...@debian.org>, Aurelien Jarno <aure...@debian.org>, Pierre Habouzit <madco...@debian.org> +Uploaders: GOTO Masanori <go...@debian.org>, Jeff Bailey <jbai...@raspberryginger.com>, Daniel Jacobowitz <d...@debian.org>, Clint Adams <cl...@debian.org>, Aurelien Jarno <aure...@debian.org>, Pierre Habouzit <madco...@debian.org> Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/ Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/ Modified: glibc-package/branches/eglibc-2.13/debian/control.in/main =================================================================== --- glibc-package/branches/eglibc-2.13/debian/control.in/main 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/control.in/main 2011-02-26 20:28:09 UTC (rev 4548) @@ -10,7 +10,7 @@ g++-4.4 (>= 4.4.2-2), g++-4.4-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 sparc] Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> -Uploaders: GOTO Masanori <go...@debian.org>, Jeff Bailey <jbai...@raspberryginger.com>, Daniel Jacobowitz <d...@debian.org>, Clint Adams <sch...@debian.org>, Aurelien Jarno <aure...@debian.org>, Pierre Habouzit <madco...@debian.org> +Uploaders: GOTO Masanori <go...@debian.org>, Jeff Bailey <jbai...@raspberryginger.com>, Daniel Jacobowitz <d...@debian.org>, Clint Adams <cl...@debian.org>, Aurelien Jarno <aure...@debian.org>, Pierre Habouzit <madco...@debian.org> Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/ Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/ Added: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sched_h.diff =================================================================== --- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sched_h.diff (rev 0) +++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-sched_h.diff 2011-02-26 20:28:09 UTC (rev 4548) @@ -0,0 +1,139 @@ +2011-01-30 Samuel Thibault <samuel.thiba...@ens-lyon.org> + +Synchronize bits/sched.h with ./sysdeps/unix/sysv/linux/bits/sched.h + +This brings the variable-size cpu_set_t manipulation macros from +./sysdeps/unix/sysv/linux/bits/sched.h + +* bits/sched.h (__CPU_ZERO, __CPU_SET, __CPU_CLR, __CPU_ISSET, +__CPU_COUNT): Remove old macros. +(__CPU_ZERO_S, __CPU_SET_S, __CPU_CLR_S, __CPU_ISSET_S, __CPU_COUNT, +__CPU_EQUAL_S, __CPU_OP_S, __CPU_ALLOC_SIZE, __CPU_ALLOC, __CPU_FREE): Add +macros. +(__sched_cpualloc, __sched_cpufree): Add declarations. + +--- +http://sourceware.org/ml/libc-alpha/2011-01/msg00054.html + + sched.h | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 72 insertions(+), 15 deletions(-) + +diff --git a/bits/sched.h b/bits/sched.h +index a068e50..9a22ae3 100644 +--- a/bits/sched.h ++++ b/bits/sched.h +@@ -1,6 +1,7 @@ + /* Definitions of constants and data structure for POSIX 1003.1b-1993 + scheduling interface. +- Copyright (C) 1996, 1997, 2001, 2003, 2007 Free Software Foundation, Inc. ++ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009 ++ Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -56,7 +57,7 @@ struct __sched_param + # define __CPU_SETSIZE 1024 + # define __NCPUBITS (8 * sizeof (__cpu_mask)) + +-/* Type for array elements in 'cpu_set'. */ ++/* Type for array elements in 'cpu_set_t'. */ + typedef unsigned long int __cpu_mask; + + /* Basic access functions. */ +@@ -70,27 +71,83 @@ typedef struct + } cpu_set_t; + + /* Access functions for CPU masks. */ +-# define __CPU_ZERO(cpusetp) \ ++# if __GNUC_PREREQ (2, 91) ++# define __CPU_ZERO_S(setsize, cpusetp) \ ++ do __builtin_memset (cpusetp, '\0', setsize); while (0) ++# else ++# define __CPU_ZERO_S(setsize, cpusetp) \ + do { \ +- unsigned int __i; \ +- cpu_set *__arr = (cpusetp); \ +- for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i) \ +- __arr->__bits[__i] = 0; \ ++ size_t __i; \ ++ size_t __imax = (setsize) / sizeof (__cpu_mask); \ ++ __cpu_mask *__bits = (cpusetp)->__bits; \ ++ for (__i = 0; __i < __imax; ++__i) \ ++ __bits[__i] = 0; \ + } while (0) +-# define __CPU_SET(cpu, cpusetp) \ +- ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu)) +-# define __CPU_CLR(cpu, cpusetp) \ +- ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu)) +-# define __CPU_ISSET(cpu, cpusetp) \ +- (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0) ++# endif ++# define __CPU_SET_S(cpu, setsize, cpusetp) \ ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ ++ |= __CPUMASK (__cpu)) \ ++ : 0; })) ++# define __CPU_CLR_S(cpu, setsize, cpusetp) \ ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ ++ &= ~__CPUMASK (__cpu)) \ ++ : 0; })) ++# define __CPU_ISSET_S(cpu, setsize, cpusetp) \ ++ (__extension__ \ ++ ({ size_t __cpu = (cpu); \ ++ __cpu < 8 * (setsize) \ ++ ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ ++ & __CPUMASK (__cpu))) != 0 \ ++ : 0; })) ++ ++# define __CPU_COUNT_S(setsize, cpusetp) \ ++ __sched_cpucount (setsize, cpusetp) ++ ++# if __GNUC_PREREQ (2, 91) ++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ ++ (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0) ++# else ++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ ++ (__extension__ \ ++ ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits; \ ++ __const __cpu_mask *__arr2 = (cpusetp2)->__bits; \ ++ size_t __imax = (setsize) / sizeof (__cpu_mask); \ ++ size_t __i; \ ++ for (__i = 0; __i < __imax; ++__i) \ ++ if (__bits[__i] != __bits[__i]) \ ++ break; \ ++ __i == __imax; })) ++# endif ++ ++# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \ ++ (__extension__ \ ++ ({ cpu_set_t *__dest = (destset); \ ++ __const __cpu_mask *__arr1 = (srcset1)->__bits; \ ++ __const __cpu_mask *__arr2 = (srcset2)->__bits; \ ++ size_t __imax = (setsize) / sizeof (__cpu_mask); \ ++ size_t __i; \ ++ for (__i = 0; __i < __imax; ++__i) \ ++ ((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i]; \ ++ __dest; })) ++ ++# define __CPU_ALLOC_SIZE(count) \ ++ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask)) ++# define __CPU_ALLOC(count) __sched_cpualloc (count) ++# define __CPU_FREE(cpuset) __sched_cpufree (cpuset) + + __BEGIN_DECLS + + extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp) + __THROW; ++extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur; ++extern void __sched_cpufree (cpu_set_t *__set) __THROW; + + __END_DECLS + +-# define __CPU_COUNT(cpusetp) \ +- __sched_cpucount (sizeof (cpu_set_t), cpusetp) + #endif Modified: glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff =================================================================== --- glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/patches/any/local-rtld.diff 2011-02-26 20:28:09 UTC (rev 4548) @@ -1,3 +1,6 @@ +2011-02-08 Steve Langasek <steve.langa...@ubuntu.com> + * elf/Makefile: use the correct path in the ldd script as well + 2006-01-21 Aurelien Jarno <aure...@debian.org> * Makeconfig: new configuration variable rtlddir to change the @@ -46,3 +49,12 @@ -DNOT_IN_libc=1 $(objpfx)interp.os: $(common-objpfx)config.make +@@ -423,7 +423,7 @@ + endif + + +-common-ldd-rewrite = -e 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' \ ++common-ldd-rewrite = -e 's%@RTLD@%$(rltddir)/$(rtld-installed-name)%g' \ + -e 's%@VERSION@%$(version)%g' \ + -e 's%@PKGVERSION@%$(PKGVERSION)%g' \ + -e 's%@REPORT_BUGS_TO@%$(REPORT_BUGS_TO)%g' Deleted: glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff =================================================================== --- glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/patches/any/submitted-sched_h.diff 2011-02-26 20:28:09 UTC (rev 4548) @@ -1,20 +0,0 @@ -2007-11-02 Aurelien Jarno <aurel...@aurel32.net> - - * bits/sched.h (__CPU_ALLOC_SIZE): Define. - ---- - bits/sched.h | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/bits/sched.h -+++ b/bits/sched.h -@@ -84,6 +84,9 @@ - # define __CPU_ISSET(cpu, cpusetp) \ - (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0) - -+# define __CPU_ALLOC_SIZE(count) \ -+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8) -+ - __BEGIN_DECLS - - extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp) Added: glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-if_freereq.diff =================================================================== --- glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-if_freereq.diff (rev 0) +++ glibc-package/branches/eglibc-2.13/debian/patches/hurd-i386/cvs-if_freereq.diff 2011-02-26 20:28:09 UTC (rev 4548) @@ -0,0 +1,61 @@ +2011-02-22 Samuel Thibault <samuel.thiba...@ens-lyon.org> + + Fix __if_freereq crash: Unlike the generic version which uses free, Hurd + needs munmap. + + * sysdeps/mach/hurd/ifreq.h: New file. + +--- + ifreq.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) +diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h +new file mode 100644 +index 0000000..99a6b94 +--- /dev/null ++++ b/sysdeps/mach/hurd/ifreq.h +@@ -0,0 +1,45 @@ ++/* Copyright (C) 1999, 2002, 2003, 2011 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Andreas Jaeger <a...@suse.de>. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#include <net/if.h> ++#include <sys/socket.h> ++#include <sys/ioctl.h> ++#include <sys/mman.h> ++ ++static inline struct ifreq * ++__if_nextreq (struct ifreq *ifr) ++{ ++#ifdef _HAVE_SA_LEN ++ if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr) ++ return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len); ++#endif ++ return ifr + 1; ++} ++ ++extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd); ++ ++ ++static inline void ++__if_freereq (struct ifreq *ifreqs, int num_ifs) ++{ ++ munmap (ifreqs, num_ifs * sizeof (struct ifreq)); ++} Modified: glibc-package/branches/eglibc-2.13/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-26 20:28:09 UTC (rev 4548) @@ -115,6 +115,7 @@ hurd-i386/cvs-header-prot.diff hurd-i386/cvs-psiginfo.diff hurd-i386/local-ptsname.diff +hurd-i386/cvs-if_freereq.diff ia64/local-dlfptr.diff ia64/submitted-sysconf.diff @@ -193,7 +194,7 @@ any/submitted-nis-netgrp.diff any/submitted-clock-settime.diff any/submitted-longdouble.diff -any/submitted-sched_h.diff +any/cvs-sched_h.diff any/local-disable-nscd-host-caching.diff #any/submitted-fileops-and-signals.diff # has issues any/local-missing-linux_types.h.diff Modified: glibc-package/branches/eglibc-2.13/debian/rules =================================================================== --- glibc-package/branches/eglibc-2.13/debian/rules 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/rules 2011-02-26 20:28:09 UTC (rev 4548) @@ -89,6 +89,7 @@ docdir=$(prefix)/share/doc mandir=$(prefix)/share/man sbindir=$(prefix)/sbin +rtlddir=/lib slibdir=/lib libdir=/usr/lib Modified: glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/rules.d/build.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -47,9 +47,7 @@ echo "sbindir = $(sbindir)" >> $(DEB_BUILDDIR)/configparms 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 + echo "rtlddir = $(call xx,rtlddir)" >> $(DEB_BUILDDIR)/configparms # Prevent autoconf from running unexpectedly by setting it to false. # Also explicitly pass CC down - this is needed to get -m64 on Modified: glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -213,6 +213,7 @@ cp $$s $$t ; \ fi ; \ sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \ + sed -e "s#RTLDDIR#$$rtlddir#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; \ Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/alpha.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -9,5 +9,4 @@ alphaev67_configure_target = alphaev67-linux-gnu alphaev67_extra_cflags = -mcpu=ev67 -mtune=ev67 -O2 alphaev67_extra_config_options = $(extra_config_options) --disable-profile -alphaev67_rtlddir = /lib alphaev67_slibdir = /lib/ev67 Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/amd64.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/amd64.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/amd64.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -18,7 +18,6 @@ i386_extra_cflags = -march=pentium4 -mtune=generic i386_extra_config_options = $(extra_config_options) i386_includedir = /usr/include/i486-linux-gnu -i386_rtlddir = /lib i386_slibdir = /lib32 i386_libdir = /usr/lib32 Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/hurd-i386.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/hurd-i386.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/hurd-i386.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -5,7 +5,6 @@ i686_add-ons = $(add-ons) i686_configure_target=i686-gnu i686_extra_cflags = -march=i686 -mtune=generic -i686_rtlddir = /lib i686_slibdir = /lib/i686/cmov i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp @@ -16,13 +15,12 @@ xen_add-ons = $(add-ons) xen_configure_target=i686-gnu xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs -xen_rtlddir = /lib xen_slibdir = /lib/i686/nosegneg xen_extra_config_options = $(extra_config_options) --disable-profile define libc0.3-dev_extra_pkg_install -mkdir -p debian/libc0.3-dev/usr/lib/xen -cp -af debian/tmp-xen/usr/lib/*.a \ - debian/libc0.3-dev/usr/lib/xen +mkdir -p debian/libc0.3-dev/$(libdir)/xen +cp -af debian/tmp-xen/$(libdir)/*.a \ + debian/libc0.3-dev/$(libdir)/xen endef Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/i386.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/i386.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/i386.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -8,7 +8,6 @@ i686_add-ons = nptl $(add-ons) i686_configure_target=i686-linux-gnu i686_extra_cflags = -march=i686 -mtune=generic -i686_rtlddir = /lib i686_slibdir = /lib/i686/cmov i686_extra_config_options = $(extra_config_options) --disable-profile @@ -19,7 +18,6 @@ xen_add-ons = nptl $(add-ons) xen_configure_target=i686-linux-gnu xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs -xen_rtlddir = /lib xen_slibdir = /lib/i686/nosegneg xen_extra_config_options = $(extra_config_options) --disable-profile @@ -44,6 +42,7 @@ amd64_CC = $(CC) -m64 -D__x86_64__ amd64_CXX = $(CXX) -m64 -D__x86_64__ amd64_extra_config_options = $(extra_config_options) --disable-profile +amd64_rtlddir = /lib64 amd64_slibdir = /lib64 amd64_libdir = /usr/lib64 @@ -56,9 +55,9 @@ endef define libc6-dev_extra_pkg_install -mkdir -p debian/libc6-dev/usr/lib/xen -cp -af debian/tmp-xen/usr/lib/*.a \ - debian/libc6-dev/usr/lib/xen +mkdir -p debian/libc6-dev/$(libdir)/xen +cp -af debian/tmp-xen/$(libdir)/*.a \ + debian/libc6-dev/$(libdir)/xen endef define libc6-dev-amd64_extra_pkg_install Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-amd64.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -1,10 +1,6 @@ # Main library extra_config_options = --disable-compatible-utmp --disable-multi-arch -libc_slibdir = /lib -libc_libdir = /usr/lib -libc_rtlddir = /lib - # /lib64 and /usr/lib64 are provided by glibc instead base-files: #259302. define libc0.1_extra_pkg_install ln -sf /lib debian/$(curpass)/lib64 @@ -23,7 +19,6 @@ i386_extra_cflags = -march=pentium4 -mtune=generic i386_extra_config_options = $(extra_config_options) i386_includedir = /usr/include/i486-kfreebsd-gnu -i386_rtlddir = /lib i386_slibdir = /lib32 i386_libdir = /usr/lib32 Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/kfreebsd-i386.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -10,6 +10,5 @@ i686_add-ons = ports linuxthreads $(add-ons) i686_configure_target=i686-kfreebsd-gnu i686_extra_cflags = -march=i686 -mtune=generic -i686_rtlddir = /lib i686_slibdir = /lib/i686/cmov i686_extra_config_options = $(extra_config_options) Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/mips.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/mips.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/mips.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -8,6 +8,7 @@ mipsn32_CC = $(CC) -mabi=n32 mipsn32_CXX = $(CXX) -mabi=n32 libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) +mipsn32_rtlddir = /lib32 mipsn32_slibdir = /lib32 mipsn32_libdir = /usr/lib32 mipsn32_extra_config_options := $(extra_config_options) --disable-profile @@ -20,6 +21,7 @@ mips64_CC = $(CC) -mabi=64 mips64_CXX = $(CXX) -mabi=64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) +mips64_rtlddir = /lib64 mips64_slibdir = /lib64 mips64_libdir = /usr/lib64 mips64_extra_config_options := $(extra_config_options) --disable-profile Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/mipsel.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/mipsel.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/mipsel.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -8,6 +8,7 @@ mipsn32_CC = $(CC) -mabi=n32 mipsn32_CXX = $(CXX) -mabi=n32 libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver)) +mipsn32_rtlddir = /lib32 mipsn32_slibdir = /lib32 mipsn32_libdir = /usr/lib32 mipsn32_extra_config_options := $(extra_config_options) --disable-profile @@ -20,6 +21,7 @@ mips64_CC = $(CC) -mabi=64 mips64_CXX = $(CXX) -mabi=64 libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver)) +mips64_rtlddir = /lib64 mips64_slibdir = /lib64 mips64_libdir = /usr/lib64 mips64_extra_config_options := $(extra_config_options) --disable-profile Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/powerpc.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/powerpc.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/powerpc.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -9,6 +9,7 @@ ppc64_CXX = $(CXX) -m64 libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver)) ppc64_extra_config_options := $(extra_config_options) --disable-profile +ppc64_rtlddir = /lib64 ppc64_slibdir = /lib64 ppc64_libdir = /usr/lib64 ppc64_includedir = /usr/include/powerpc64-linux-gnu Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/ppc64.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/ppc64.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/ppc64.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -1,5 +1,3 @@ -libc_slibdir = /lib -libc_libdir = /usr/lib libc_rtlddir = /lib64 extra_config_options = --enable-multi-arch @@ -19,7 +17,6 @@ powerpc_CXX = $(CXX) -m32 powerpc_includedir = /usr/include/powerpc-linux-gnu powerpc_extra_config_options := $(extra_config_options) --disable-profile -powerpc_rtlddir = /lib powerpc_slibdir = /lib32 powerpc_libdir = /usr/lib32 Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/s390.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/s390.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/s390.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -8,6 +8,7 @@ libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver)) s390x_extra_config_options := $(extra_config_options) --disable-profile s390x_includedir = /usr/include/s390x-linux-gnu +s390x_rtlddir = /lib64 s390x_slibdir = /lib64 s390x_libdir = /usr/lib64 Modified: glibc-package/branches/eglibc-2.13/debian/sysdeps/sparc.mk =================================================================== --- glibc-package/branches/eglibc-2.13/debian/sysdeps/sparc.mk 2011-02-26 20:06:37 UTC (rev 4547) +++ glibc-package/branches/eglibc-2.13/debian/sysdeps/sparc.mk 2011-02-26 20:28:09 UTC (rev 4548) @@ -10,6 +10,7 @@ libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver)) sparc64_extra_config_options = $(extra_config_options) --disable-profile sparc64_includedir = /usr/include/sparc64-linux-gnu +sparc64_rtlddir = /lib64 sparc64_slibdir = /lib64 sparc64_libdir = /usr/lib64 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1ptqkm-0008uy...@alioth.debian.org