[hurd] 03/03: Merge bootstrap patch into external

[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 66d13ac10e57e3cb744ae7d83bf7f6ec5d36d64f
Author: Samuel Thibault <address@hidden>
Date:   Fri Aug 28 20:29:34 2015 +0200

    Merge bootstrap patch into external
---
 debian/changelog               |  1 -
 debian/patches/bootstrap.patch | 13 -------------
 debian/patches/external.patch  |  4 +++-
 debian/patches/series          |  1 -
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1a5a1b..620966f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ 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.
   * Move console modules to multiarch path.
   * Bump fakeroot-hurd priority so it becomes the default.
 
diff --git a/debian/patches/bootstrap.patch b/debian/patches/bootstrap.patch
deleted file mode 100644
index 255e8b4..0000000
--- a/debian/patches/bootstrap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-We should fix that into disabling targets
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -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
--  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/external.patch b/debian/patches/external.patch
index e578b70..c746aac 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -1,5 +1,7 @@
 Include DDE in the build
 
+TODO: We should turn AC_MSG_WARN into disabling targets
+
 Index: hurd-debian/Makefile
 ===================================================================
 --- hurd-debian.orig/Makefile
@@ -46,7 +48,7 @@ Index: hurd-debian/configure.ac
 +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/series b/debian/patches/series
index 90d133d..3836288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,4 +43,3 @@ newRPC.patch
 dl_origin.patch
 fix-payload-pflocal.patch
 fakeroot-access.patch
-bootstrap.patch

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