r2384 - in glibc-package/branches/glibc-2.6/debian: . rules.d sysdeps
Author: aurel32
Date: 2007-06-22 19:20:42 +0000 (Fri, 22 Jun 2007)
New Revision: 2384
Modified:
glibc-package/branches/glibc-2.6/debian/changelog
glibc-package/branches/glibc-2.6/debian/rules
glibc-package/branches/glibc-2.6/debian/rules.d/build.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/hurd.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/i386.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/kfreebsd-amd64.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/mipsel.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/powerpc.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/ppc64.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/s390.mk
glibc-package/branches/glibc-2.6/debian/sysdeps/sparc.mk
Log:
* debian/rules, debian/rules.d/build.mk, debian/sysdeps/*.mk: also defines
CXX as g++ is used in the testsuite.
Modified: glibc-package/branches/glibc-2.6/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.6/debian/changelog 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/changelog 2007-06-22 19:20:42 UTC (rev 2384)
@@ -76,6 +76,8 @@
* locales-depver: tighten locales dependencies.
* debian/sysdeps/linux.mk, debian/script.in/kernelcheck.sh: bump minimum
kernel requirement to 2.6.8.
+ * debian/rules, debian/rules.d/build.mk, debian/sysdeps/*.mk: also defines
+ CXX as g++ is used in the testsuite.
[ Petr Salinger]
* kfreebsd/local-sysdeps.diff: update to revision 1949 (from glibc-bsd).
@@ -101,7 +103,7 @@
* patches/localedata/fix-am_ET.diff: fix am_ET using our preprocessor
extensions.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 22 Jun 2007 20:36:17 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 22 Jun 2007 21:20:23 +0200
glibc (2.5-11) UNRELEASED; urgency=low
Modified: glibc-package/branches/glibc-2.6/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.6/debian/rules 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/rules 2007-06-22 19:20:42 UTC (rev 2384)
@@ -101,6 +101,7 @@
sbindir=$(prefix)/sbin
BUILD_CC = gcc-4.1
+CXX = g++-4.1
RUN_TESTSUITE = yes
Modified: glibc-package/branches/glibc-2.6/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/rules.d/build.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/rules.d/build.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -24,6 +24,7 @@
@echo Configuring $(curpass)
rm -f $(DEB_BUILDDIR)/configparms
echo "CC = $(call xx,CC)" >> $(DEB_BUILDDIR)/configparms
+ echo "CXX = $(call xx,CXX)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CC = $(BUILD_CC)" >> $(DEB_BUILDDIR)/configparms
echo "CFLAGS = $(HOST_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
echo "BUILD_CFLAGS = $(BUILD_CFLAGS)" >> $(DEB_BUILDDIR)/configparms
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/hurd.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/hurd.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -23,6 +23,7 @@
# Build with gcc-4.1 is not yet supported.
CC = gcc-4.0
+CXX = g++-4.0
BUILD_CC = gcc-4.0
# Only use libidn as add-on.
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/i386.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/i386.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -42,6 +42,7 @@
# __x86_64__ is defined here because Makeconfig uses -undef and the
# /usr/include/asm wrappers need that symbol.
amd64_CC = $(CC) -m64 -D__x86_64__
+amd64_CXX = $(CXX) -m64 -D__x86_64__
amd64_extra_cflags = -O3 -g
amd64_extra_config_options = $(extra_config_options) --disable-profile
amd64_includedir = /usr/include/x86_64-linux-gnu
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/kfreebsd-amd64.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/kfreebsd-amd64.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/kfreebsd-amd64.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -15,6 +15,7 @@
i386_configure_target = i486-kfreebsd
i386_CC = $(CC) -m32
+i386_CXX = $(CXX) -m32
i386_add-ons = ports linuxthreads $(add-ons)
i386_extra_cflags = -march=pentium4 -g -O3
i386_extra_config_options = $(extra_config_options) --disable-compatible-utmp
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/mips.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/mips.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -6,6 +6,7 @@
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips32-linux
mipsn32_CC = $(CC) -mabi=n32
+mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_extra_cflags = -O3 -g
mipsn32_slibdir = /lib32
@@ -18,6 +19,7 @@
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64-linux
mips64_CC = $(CC) -mabi=64
+mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_extra_cflags = -O3 -g
mips64_slibdir = /lib64
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/mipsel.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/mipsel.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -6,6 +6,7 @@
mipsn32_add-ons = ports nptl $(add-ons)
mipsn32_configure_target = mips32-linux
mipsn32_CC = $(CC) -mabi=n32
+mipsn32_CXX = $(CXX) -mabi=n32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_extra_cflags = -O3 -g
mipsn32_slibdir = /lib32
@@ -18,6 +19,7 @@
mips64_add-ons = ports nptl $(add-ons)
mips64_configure_target = mips64-linux
mips64_CC = $(CC) -mabi=64
+mips64_CXX = $(CXX) -mabi=64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_extra_cflags = -O3 -g
mips64_slibdir = /lib64
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/powerpc.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/powerpc.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -4,6 +4,7 @@
ppc64_add-ons = nptl $(add-ons)
ppc64_configure_target = powerpc64-linux
ppc64_CC = $(CC) -m64
+ppc64_CXX = $(CXX) -m64
libc6-ppc64_shlib_dep = libc6-ppc64 (>= $(shlib_dep_ver))
ppc64_extra_cflags = -O3 -g
ppc64_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/ppc64.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/ppc64.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/ppc64.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -16,6 +16,7 @@
powerpc_add-ons = nptl $(add-ons)
powerpc_configure_target = powerpc-linux
powerpc_CC = $(CC) -m32
+powerpc_CXX = $(CXX) -m32
powerpc_extra_cflags = -O3 -g
powerpc_includedir = /usr/include/powerpc-linux-gnu
powerpc_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/s390.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/s390.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -4,6 +4,7 @@
s390x_add-ons = nptl $(add-ons)
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
+s390x_CXX = $(CXX) -m64
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g -O3
s390x_extra_config_options := $(extra_config_options) --disable-profile
Modified: glibc-package/branches/glibc-2.6/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.6/debian/sysdeps/sparc.mk 2007-06-22 18:39:52 UTC (rev 2383)
+++ glibc-package/branches/glibc-2.6/debian/sysdeps/sparc.mk 2007-06-22 19:20:42 UTC (rev 2384)
@@ -3,7 +3,8 @@
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
sparc64_add-ons = nptl $(add-ons)
sparc64_configure_target=sparc64-linux
-sparc64_CC = $(BUILD_CC) -m64
+sparc64_CC = $(CC) -m64
+sparc64_CXX = $(CXX) -m64
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_extra_cflags = -g -O3
sparc64_extra_config_options = $(extra_config_options) --disable-profile
Reply to: