[hurd] 02/02: rather disable tests in rules, to avoid the ac_no_link issue

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 908013fc36c379c855a178cd5452f5e1696ff554
Author: Samuel Thibault <address@hidden>
Date:   Wed Aug 19 19:04:43 2015 +0200

    rather disable tests in rules, to avoid the ac_no_link issue
---
 debian/patches/bootstrap.patch | 22 +---------------------
 debian/rules                   | 13 ++++++++++---
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian/patches/bootstrap.patch b/debian/patches/bootstrap.patch
index 429cfe5..255e8b4 100644
--- a/debian/patches/bootstrap.patch
+++ b/debian/patches/bootstrap.patch
@@ -2,27 +2,7 @@ We should fix that into disabling targets
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -103,7 +103,7 @@ AC_CHECK_TOOL(RANLIB, ranlib)
- AC_CHECK_TOOL(MIG, mig)
- # Require MiG.
- if test x${MIG} = x; then
--  AC_MSG_ERROR([
-+  AC_MSG_WARN([
- *** You need GNU MiG to compile the GNU Hurd, please see
- *** http://www.gnu.org/software/hurd/mig.html for further details, or
- *** download it directly from the main GNU server (ftp.gnu.org) or any
-@@ -163,7 +163,9 @@ else
- fi
- AC_SUBST(VERSIONING)
- # Check if libc contains these functions.
--AC_CHECK_FUNCS(file_exec_file_name exec_exec_file_name _hurd_exec_file_name)
-+if test "x$cross_compiling" = "xno"; then
-+  AC_CHECK_FUNCS(file_exec_file_name exec_exec_file_name _hurd_exec_file_name)
-+fi
- 
- 
- # From glibc HEAD, 2007-11-07.
-@@ -250,7 +252,7 @@ AC_MSG_RESULT($boot_store_types)
+@@ -250,7 +250,7 @@ AC_MSG_RESULT($boot_store_types)
  AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess, 
LIBPCIACCESS=no)
  AC_SUBST(LIBPCIACCESS)
  if test "$LIBPCIACCESS" = "no"; then
diff --git a/debian/rules b/debian/rules
index 059c89d..5a4ea07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,18 @@ CONFIGURE_ARGS = \
                 --disable-ncursesw \
                 --without-libbz2 \
                 --without-libz \
-                --without-parted \
-                --build=i586-gnu
-# Skip the clnt_create check because it expects
+                --without-parted
+# Skip some checks because they expect
 # a working glibc causing a circular dependency.
+# TODO: rather disable the corresponding features in configure.ac
 export ac_cv_search_clnt_create=no
+export ac_cv_lib_pciaccess_pci_system_init=no
+export ac_cv_func_file_exec_file_name=no
+export ac_cv_func_exec_exec_file_name=no
+export ac_cv_func__hurd_exec_file_name=no
+export LEX=:
+export YACC=:
+export MIG=:
 endif
 CONFIGURE_ARGS_deb =
 CONFIGURE_ARGS_udeb = --without-libdaemon --without-libbz2

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git