[hurd] 01/02: Do not revert disabling executable on cross-build

[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 0f846366da76a3c797a1156a9e2233f8378eb255
Author: Samuel Thibault <address@hidden>
Date:   Wed Aug 19 17:39:57 2015 +0200

    Do not revert disabling executable on cross-build
    
    disable the problematic link test instead.
---
 debian/patches/bootstrap.patch           | 33 ++++++++++++++++++++++++++++++++
 debian/patches/git-revert-dc7e6a13.patch | 29 ----------------------------
 debian/patches/series                    |  1 -
 3 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/debian/patches/bootstrap.patch b/debian/patches/bootstrap.patch
new file mode 100644
index 0000000..429cfe5
--- /dev/null
+++ b/debian/patches/bootstrap.patch
@@ -0,0 +1,33 @@
+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)
+ AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess, 
LIBPCIACCESS=no)
+ AC_SUBST(LIBPCIACCESS)
+ if test "$LIBPCIACCESS" = "no"; then
+-  AC_MSG_ERROR([libpciaccess must be install in order to use libddekit])
++  AC_MSG_WARN([libpciaccess must be install in order to use libddekit])
+ fi
+ 
+ # Check for ncursesw, which is needed for the console-curses client.
diff --git a/debian/patches/git-revert-dc7e6a13.patch 
b/debian/patches/git-revert-dc7e6a13.patch
deleted file mode 100644
index ef6e7dc..0000000
--- a/debian/patches/git-revert-dc7e6a13.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-We revert this, as it breaks rebootstrapping: AC_CHECK_FUNCS aborts, and we'll
-want to link executables in the end, anyway.
-
-commit dc7e6a136e9baf98a2323758765aeab7ebae336c
-Author: Ludovic Courtès <address@hidden>
-Date:   Thu May 29 23:09:06 2014 +0200
-
-    Disable linking when cross-compiling
-    
-    * configure.ac: Call AC_NO_EXECUTABLES when cross-compiling.
-
-diff --git b/configure.ac a/configure.ac
-index cf8590b..873ced8 100644
---- b/configure.ac
-+++ a/configure.ac
-@@ -83,13 +83,6 @@ AC_PROG_INSTALL
- AC_PROG_AWK
- AC_PROG_SED
- 
--if test "x$cross_compiling" = "xyes"; then
--   # It may be that we don't have a working libc yet, for instance
--   # because we're bootstrapping the cross-compilation tool chain.
--   # Thus, use this undocumented Autoconf macro designed for this.
--   AC_NO_EXECUTABLES
--   AC_MSG_WARN("cross-compiling, disabling linking")
--fi
- AC_PROG_CC
- # Require GCC.
- if test x$GCC != xyes; then
diff --git a/debian/patches/series b/debian/patches/series
index e360dda..90d133d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,4 +44,3 @@ dl_origin.patch
 fix-payload-pflocal.patch
 fakeroot-access.patch
 bootstrap.patch
-git-revert-dc7e6a13.patch

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