r1308 - in glibc-package/trunk/debian: . control.in patches sysdeps
Author: aurel32
Date: 2006-03-26 22:34:50 +0000 (Sun, 26 Mar 2006)
New Revision: 1308
Added:
glibc-package/trunk/debian/patches/amd64-i386-biarch.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/i386
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
+ * Make ldconfig look into /lib32 and /usr/lib32 on amd64. Add /lib32 ->
+ /emul/ia32-linux/lib and /usr/lib32 -> /emul/ia32-linux/usr/lib links.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/changelog 2006-03-26 22:34:50 UTC (rev 1308)
@@ -8,6 +8,8 @@
* Split out timezone data in a separate package. It's a first step, it
should finally be built from a separate source package.
* Fix ldconfig multiarch patch for reiserfs filesystems.
+ * Make ldconfig look into /lib32 and /usr/lib32 on amd64. Add /lib32 ->
+ /emul/ia32-linux/lib and /usr/lib32 -> /emul/ia32-linux/usr/lib links.
-- Denis Barbier <barbier@debian.org> Mon, 20 Mar 2006 21:36:11 +0100
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/control 2006-03-26 22:34:50 UTC (rev 1308)
@@ -44,6 +44,15 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
+Package: tzdata
+Architecture: all
+Section: libs
+Priority: required
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Timezone data
+ This package contains data files with rules for various timezones around
+ the world.
+
Package: nscd
Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
@@ -60,11 +69,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Description: GNU C Library: Shared libraries and Timezone data
+Depends: tzdata
+Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
- Timezone data is also included.
Package: libc6-dev
Architecture: amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
@@ -132,11 +141,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Description: GNU C Library: Shared libraries and Timezone data
+Depends: tzdata
+Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
- Timezone data is also included.
Package: libc6.1-dev
Architecture: alpha ia64
@@ -204,11 +213,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Description: GNU C Library: Shared libraries and Timezone data
+Depends: tzdata
+Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
- Timezone data is also included.
Package: libc0.3-dev
Architecture: hurd-i386
@@ -276,11 +285,11 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Description: GNU C Library: Shared libraries and Timezone data
+Depends: tzdata
+Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
- Timezone data is also included.
Package: libc0.1-dev
Architecture: kfreebsd-i386 kfreebsd-amd64
@@ -348,6 +357,7 @@
Section: libs
Priority: standard
Depends: libc6 (= ${Source-Version})
+Replaces: libc6-dev-i386
Conflicts: ia32-libs (<= 1.5)
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
Modified: glibc-package/trunk/debian/control.in/i386
===================================================================
--- glibc-package/trunk/debian/control.in/i386 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/control.in/i386 2006-03-26 22:34:50 UTC (rev 1308)
@@ -3,6 +3,7 @@
Section: libs
Priority: standard
Depends: libc6 (= ${Source-Version})
+Replaces: libc6-dev-i386
Conflicts: ia32-libs (<= 1.5)
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
Added: glibc-package/trunk/debian/patches/amd64-i386-biarch.diff
===================================================================
--- glibc-package/trunk/debian/patches/amd64-i386-biarch.diff 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/patches/amd64-i386-biarch.diff 2006-03-26 22:34:50 UTC (rev 1308)
@@ -0,0 +1,30 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Allow ldconfig to work on x86-64/i386 biarch systems
+
+--- libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h.orig 2006-03-27 00:08:28.219686388 +0200
++++ libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h 2006-03-27 00:09:23.199203246 +0200
+@@ -22,4 +22,23 @@
+ #define _dl_cache_check_flags(flags) \
+ ((flags) == _DL_CACHE_DEFAULT_ID)
+
+-#include <sysdeps/unix/sysv/linux/sparc/dl-cache.h>
++#define add_system_dir(dir) \
++ do \
++ { \
++ size_t len = strlen (dir); \
++ char path[len + 3]; \
++ memcpy (path, dir, len + 1); \
++ if (len >= 6 && ! memcmp (path + len - 6, "/lib32", 6)) \
++ { \
++ len -= 2; \
++ path[len] = '\0'; \
++ } \
++ add_dir (path); \
++ if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \
++ { \
++ memcpy (path + len, "64", 3); \
++ add_dir (path); \
++ } \
++ } while (0)
++
++#include <sysdeps/generic/dl-cache.h>
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/patches/series 2006-03-26 22:34:50 UTC (rev 1308)
@@ -73,6 +73,7 @@
localedata/locale-ro_RO.diff -p0
glibc235-gcc4-hppa-profile.diff -p0
glibc235-dl-execstack.diff -p0
+amd64-i386-biarch.diff -p1
i386-amd64-biarch.diff -p1
hppa-iitlbp.diff -p1
hppa-fenv-align.diff -p1
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-03-26 21:42:46 UTC (rev 1307)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-03-26 22:34:50 UTC (rev 1308)
@@ -31,10 +31,11 @@
mkdir -p debian/libc6-dev-i386/usr/include
cp -af debian/tmp-i386/usr/include/i486-linux-gnu \
debian/libc6-dev-i386/usr/include
-ln -sf /emul/ia32-linux/usr/lib debian/libc6-dev-i386/usr/lib32
endef
define libc6-i386_extra_pkg_install
mkdir -p debian/libc6-i386/lib
ln -sf /emul/ia32-linux/lib/ld-linux.so.2 debian/libc6-i386/lib
+ln -sf /emul/ia32-linux/lib debian/libc6-i386/lib32
+ln -sf /emul/ia32-linux/usr/lib debian/libc6-i386/usr/lib32
endef
Reply to: