r1640 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/rules.d trunk/debian trunk/debian/rules.d trunk/debian/sysdeps
Author: aurel32
Date: 2006-06-08 13:22:55 +0000 (Thu, 08 Jun 2006)
New Revision: 1640
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
glibc-package/trunk/debian/sysdeps/s390.mk
Log:
* Build with gcc 4.1 on all architectures but hurd-i386.
* debian/sysdeps/s390.mk: switch s390x to nptl.
* debian/rules.d/build.mk: use ld.so instead of libc.so to determine if the
host CPU is able to run the testsuite.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-08 13:22:55 UTC (rev 1640)
@@ -142,6 +142,9 @@
* Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
+ * debian/sysdeps/s390.mk: switch s390x to nptl.
+ * debian/rules.d/build.mk: use ld.so instead of libc.so to determine if the
+ host CPU is able to run the testsuite.
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-06-08 13:22:55 UTC (rev 1640)
@@ -84,7 +84,7 @@
echo "DEB_BUILD_OPTIONS contains nocheck, skipping tests."; \
echo "Tests have been disabled via DEB_BUILD_OPTIONS." > $(log_test) ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
- ! $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
+ ! $(DEB_BUILDDIR)/elf/ld.so >/dev/null 2>&1 ; then \
echo "Cross compiling, skipping tests."; \
echo "Flavour cross-compiled, tests have been skipped." > $(log_test) ; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/trunk/debian/changelog 2006-06-08 13:22:55 UTC (rev 1640)
@@ -5,6 +5,9 @@
* Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
upstream.
* Build with gcc 4.1 on all architectures but hurd-i386.
+ * debian/sysdeps/s390.mk: switch s390x to nptl.
+ * debian/rules.d/build.mk: use ld.so instead of libc.so to determine if the
+ host CPU is able to run the testsuite.
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/trunk/debian/rules 2006-06-08 13:22:55 UTC (rev 1640)
@@ -98,7 +98,7 @@
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
-BUILD_CC = gcc-4.0
+BUILD_CC = gcc-4.1
RUN_TESTSUITE = yes
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-06-08 13:22:55 UTC (rev 1640)
@@ -83,7 +83,7 @@
echo "DEB_BUILD_OPTIONS contains nocheck, skipping tests."; \
echo "Tests have been disabled via DEB_BUILD_OPTIONS." > $(log_test) ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
- ! $(DEB_BUILDDIR)/libc.so >/dev/null 2>&1 ; then \
+ ! $(DEB_BUILDDIR)/elf/ld.so >/dev/null 2>&1 ; then \
echo "Cross compiling, skipping tests."; \
echo "Flavour cross-compiled, tests have been skipped." > $(log_test) ; \
elif ! $(call kernel_check,$(call xx,MIN_KERNEL_SUPPORTED)); then \
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2006-06-08 09:41:21 UTC (rev 1639)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2006-06-08 13:22:55 UTC (rev 1640)
@@ -4,9 +4,10 @@
# build 64-bit (s390x) alternative library
GLIBC_PASSES += s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
+s390x_MIN_KERNEL_SUPPORTED = 2.6.0
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
-s390x_add-ons = linuxthreads $(add-ons)
+s390x_add-ons = nptl $(add-ons)
libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
s390x_extra_cflags = -g1 -O3
s390x_slibdir = /lib64
Reply to: