r4657 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2011-05-12 05:18:04 +0000 (Thu, 12 May 2011)
New Revision: 4657
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
* debian/sysdeps/amd64.mk: don't redefine libc6_extra_pkg_install.
Closes: #626447, #626449, #626450.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-05-11 22:11:53 UTC (rev 4656)
+++ glibc-package/trunk/debian/changelog 2011-05-12 05:18:04 UTC (rev 4657)
@@ -1,3 +1,10 @@
+eglibc (2.13-4) unstable; urgency=low
+
+ * debian/sysdeps/amd64.mk: don't redefine libc6_extra_pkg_install.
+ Closes: #626447, #626449, #626450.
+
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 12 May 2011 07:16:55 +0200
+
eglibc (2.13-3) unstable; urgency=low
* patches/any/local-no-pagesize.diff: use __sysconf() instead of
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2011-05-11 22:11:53 UTC (rev 4656)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2011-05-12 05:18:04 UTC (rev 4657)
@@ -5,6 +5,15 @@
define libc6_extra_pkg_install
ln -sf /lib debian/$(curpass)/lib64
ln -sf lib debian/$(curpass)/usr/lib64
+
+make -C debian/local/memcpy-wrapper
+install -m 755 -o root -g root -d debian/libc6/$(libdir)/libc
+install -m 755 -o root -g root \
+ debian/local/memcpy-wrapper/memcpy-preload.so \
+ debian/libc6/$(libdir)/libc
+install -m 755 -o root -g root \
+ debian/local/memcpy-wrapper/memcpy-syslog-preload.so \
+ debian/libc6/$(libdir)/libc
endef
# build 32-bit (i386) alternative library
@@ -21,17 +30,6 @@
i386_slibdir = /lib32
i386_libdir = /usr/lib32
-define libc6_extra_pkg_install
-make -C debian/local/memcpy-wrapper
-install -m 755 -o root -g root -d debian/libc6/$(libdir)/libc
-install -m 755 -o root -g root \
- debian/local/memcpy-wrapper/memcpy-preload.so \
- debian/libc6/$(libdir)/libc
-install -m 755 -o root -g root \
- debian/local/memcpy-wrapper/memcpy-syslog-preload.so \
- debian/libc6/$(libdir)/libc
-endef
-
define libc6-dev-i386_extra_pkg_install
mkdir -p debian/libc6-dev-i386/usr/include/gnu
cp -af debian/tmp-i386/usr/include/i486-linux-gnu/gnu/stubs-32.h \
Reply to: