[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: patches/git-revert-dc7e6a13: Revert upstream check against
From: |
Samuel Thibault |
Subject: |
[hurd] 01/01: patches/git-revert-dc7e6a13: Revert upstream check against cross-compiling |
Date: |
Tue, 18 Aug 2015 21:02:14 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository hurd.
commit 505763d9fad6242f54455b029d125a5989f70bc6
Author: Samuel Thibault <address@hidden>
Date: Tue Aug 18 23:01:39 2015 +0200
patches/git-revert-dc7e6a13: Revert upstream check against cross-compiling
---
debian/changelog | 1 +
debian/patches/git-revert-dc7e6a13.patch | 29 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 31 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 87af9f3..249035f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ hurd (1:0.6.git20150704-4) UNRELEASED; urgency=medium
* Upgrade to compat 9.
* Add a noudeb build profile.
* Add stage1 and stage2 build profiles for cross-bootstrapping hurd.
+ * patches/git-revert-dc7e6a13: Revert upstream check against cross-compiling.
-- Samuel Thibault <address@hidden> Tue, 18 Aug 2015 10:50:47 +0000
diff --git a/debian/patches/git-revert-dc7e6a13.patch
b/debian/patches/git-revert-dc7e6a13.patch
new file mode 100644
index 0000000..ef6e7dc
--- /dev/null
+++ b/debian/patches/git-revert-dc7e6a13.patch
@@ -0,0 +1,29 @@
+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 90d133d..e360dda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,4 @@ 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