r5402 - in glibc-package/branches/eglibc-2.16/debian: . control.in sysdeps
Author: adconrad
Date: 2012-11-25 07:53:14 +0000 (Sun, 25 Nov 2012)
New Revision: 5402
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/control
glibc-package/branches/eglibc-2.16/debian/control.in/main
glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
Log:
* debian/sysdeps/{amd64,i386}.mk: Enable and bootstrap x32 multilib builds.
* debian/control.in/main: Bump g++4.7 build-dep to 4.7.2-11 for x32 builds.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 07:32:41 UTC (rev 5401)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 07:53:14 UTC (rev 5402)
@@ -5,6 +5,8 @@
with my C++ header detection patch on glibc trunk, for g++-4.7_4.7.2-10.
* Add patches/powerpc/submitted-UAPI_ASM_POWERPC_ELF.diff to fix builds on
PowerPC against linux headers from 3.7-rc. Remove if fixed for 3.7-final.
+ * debian/sysdeps/{amd64,i386}.mk: Enable and bootstrap x32 multilib builds.
+ * debian/control.in/main: Bump g++4.7 build-dep to 4.7.2-11 for x32 builds.
[ Aurelien Jarno ]
* Add patches/m68k/cvs-syscall-arguments.diff to fix cancellable syscall
Modified: glibc-package/branches/eglibc-2.16/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control 2012-11-25 07:32:41 UTC (rev 5401)
+++ glibc-package/branches/eglibc-2.16/debian/control 2012-11-25 07:53:14 UTC (rev 5402)
@@ -9,7 +9,7 @@
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.6 [!arm64 !x32], g++-4.6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc],
- g++-4.7 (>= 4.7.2-3) [arm64 x32], g++-4.7-multilib (>= 4.7.2-3) [x32]
+ g++-4.7 (>= 4.7.2-11) [amd64 arm64 i386 x32], g++-4.7-multilib (>= 4.7.2-11) [amd64 i386 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: binutils-gold
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Modified: glibc-package/branches/eglibc-2.16/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/control.in/main 2012-11-25 07:32:41 UTC (rev 5401)
+++ glibc-package/branches/eglibc-2.16/debian/control.in/main 2012-11-25 07:53:14 UTC (rev 5402)
@@ -9,7 +9,7 @@
kfreebsd-kernel-headers [kfreebsd-any],
binutils (>= 2.21),
g++-4.6 [!arm64 !x32], g++-4.6-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc],
- g++-4.7 (>= 4.7.2-3) [arm64 x32], g++-4.7-multilib (>= 4.7.2-3) [x32]
+ g++-4.7 (>= 4.7.2-11) [amd64 arm64 i386 x32], g++-4.7-multilib (>= 4.7.2-11) [amd64 i386 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Build-Conflicts: binutils-gold
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-11-25 07:32:41 UTC (rev 5401)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/amd64.mk 2012-11-25 07:53:14 UTC (rev 5402)
@@ -37,23 +37,23 @@
ln -sf /lib32/ld-linux.so.2 debian/libc6-i386/lib
endef
-## build x32 ABI alternative library
-#EGLIBC_PASSES += x32
-#DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
-#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-#x32_add-ons = nptl $(add-ons)
-#x32_configure_target = x86_64-linux-gnux32
-#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
-#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
-#x32_extra_config_options = $(extra_config_options) --disable-profile
-#x32_slibdir = /libx32
-#x32_libdir = /usr/libx32
-#
-#define libc6-dev-x32_extra_pkg_install
-#
-#mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
-#cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
-# debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
-#
-#endef
+# build x32 ABI alternative library
+EGLIBC_PASSES += x32
+DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
+x32_add-ons = nptl $(add-ons)
+x32_configure_target = x86_64-linux-gnux32
+x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
+x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
+x32_extra_config_options = $(extra_config_options) --disable-profile
+x32_slibdir = /libx32
+x32_libdir = /usr/libx32
+define libc6-dev-x32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu
+cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
+ debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
+
+endef
+
Modified: glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-11-25 07:32:41 UTC (rev 5401)
+++ glibc-package/branches/eglibc-2.16/debian/sysdeps/i386.mk 2012-11-25 07:53:14 UTC (rev 5402)
@@ -75,22 +75,22 @@
endef
-## build x32 ABI alternative library
-#EGLIBC_PASSES += x32
-#DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
-#libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
-#x32_add-ons = nptl $(add-ons)
-#x32_configure_target = x86_64-linux-gnux32
-#x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
-#x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
-#x32_extra_config_options = $(extra_config_options) --disable-profile
-#x32_slibdir = /libx32
-#x32_libdir = /usr/libx32
-#
-#define libc6-dev-x32_extra_pkg_install
-#
-#mkdir -p debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
-#cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
-# debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
-#
-#endef
+# build x32 ABI alternative library
+EGLIBC_PASSES += x32
+DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
+x32_add-ons = nptl $(add-ons)
+x32_configure_target = x86_64-linux-gnux32
+x32_CC = $(DEB_HOST_GNU_TYPE)-$(BASE_CC)-4.7 -mx32
+x32_CXX = $(DEB_HOST_GNU_TYPE)-$(BASE_CXX)-4.7 -mx32
+x32_extra_config_options = $(extra_config_options) --disable-profile
+x32_slibdir = /libx32
+x32_libdir = /usr/libx32
+
+define libc6-dev-x32_extra_pkg_install
+
+mkdir -p debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
+cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
+ debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
+
+endef
Reply to: