r1654 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/rules.d trunk/debian trunk/debian/rules.d
Author: aurel32
Date: 2006-06-13 17:18:56 +0000 (Tue, 13 Jun 2006)
New Revision: 1654
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.d/build.mk
Log:
* debian/rules.d/build.mk: use ld.so libc.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-13 16:55:06 UTC (rev 1653)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-13 17:18:56 UTC (rev 1654)
@@ -148,8 +148,8 @@
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.
+ * debian/rules.d/build.mk: use ld.so libc.so instead of libc.so to
+ determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
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-13 16:55:06 UTC (rev 1653)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-06-13 17:18:56 UTC (rev 1654)
@@ -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)/elf/ld.so >/dev/null 2>&1 ; then \
+ ! $(DEB_BUILDDIR)/elf/ld.so $(DEB_BUILDDIR)/libc.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-13 16:55:06 UTC (rev 1653)
+++ glibc-package/trunk/debian/changelog 2006-06-13 17:18:56 UTC (rev 1654)
@@ -7,8 +7,8 @@
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.
+ * debian/rules.d/build.mk: use ld.so libc.so instead of libc.so to
+ determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-06-13 16:55:06 UTC (rev 1653)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-06-13 17:18:56 UTC (rev 1654)
@@ -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)/elf/ld.so >/dev/null 2>&1 ; then \
+ ! $(DEB_BUILDDIR)/elf/ld.so $(DEB_BUILDDIR)/libc.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 \
Reply to: