[hurd] 01/01: Make libpciaccess and libpcap dependencies optional

[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 ccddb0ce1c6e5c39b19d10471a7391a1a0a4d660
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 29 12:37:52 2015 +0100

    Make libpciaccess and libpcap dependencies optional
    
      * patches/external.patch: Do not build DDE when libpciaccess is not
        available, do not build eth-filter when libpcap is not available.
---
 debian/changelog              |  2 ++
 debian/patches/external.patch | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75cca03..f422c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ hurd (1:0.7-2) UNRELEASED; urgency=medium
 
   * control, rules: Add a stage3 which builds everything that can be built
     with libc.so.
+  * patches/external.patch: Do not build DDE when libpciaccess is not
+    available, do not build eth-filter when libpcap is not available.
 
  -- Samuel Thibault <address@hidden>  Fri, 27 Nov 2015 21:45:18 +0100
 
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index bb91dc8..e4c25d4 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -2,21 +2,25 @@ Include DDE in the build
 
 --- a/Makefile
 +++ b/Makefile
-@@ -28,7 +28,12 @@ include ./Makeconf
+@@ -28,7 +28,16 @@ include ./Makeconf
  # Hurd libraries
  lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \
              libpager libfshelp libdiskfs libtrivfs libps \
 -            libnetfs libpipe libstore libhurdbugaddr libftpconn libcons
 +            libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \
-+            libbpf libhurd-slab eth-filter eth-multiplexer
++            libbpf libhurd-slab eth-multiplexer
 +
 +ifneq ($(LIBPCIACCESS),no)
 +lib-subdirs += libmachdev libddekit
 +endif
++
++ifeq ($(HAVE_PCAP),yes)
++lib-subdirs += eth-filter
++endif
  
  # Hurd programs
  prog-subdirs = auth proc exec term \
-@@ -42,6 +47,7 @@ prog-subdirs = auth proc exec term \
+@@ -42,6 +51,7 @@ prog-subdirs = auth proc exec term \
               procfs \
               startup \
               init \
@@ -37,7 +41,7 @@ Include DDE in the build
  
 --- a/configure.ac
 +++ b/configure.ac
-@@ -245,6 +245,12 @@ AC_SUBST(boot_store_types)dnl
+@@ -245,6 +245,13 @@ AC_SUBST(boot_store_types)dnl
  AC_MSG_CHECKING(boot store types)
  AC_MSG_RESULT($boot_store_types)
  
@@ -46,16 +50,20 @@ Include DDE in the build
 +if test "$LIBPCIACCESS" = "no"; then
 +  AC_MSG_WARN([libpciaccess must be installed in order to use libddekit])
 +fi
++AC_CHECK_HEADER([pcap.h], [HAVE_PCAP=yes], [HAVE_PCAP=no])
 +
  # Check for ncursesw, which is needed for the console-curses client.
  hurd_LIB_NCURSESW
  
 --- a/config.make.in
 +++ b/config.make.in
-@@ -98,6 +98,9 @@ libblkid_LIBS = @libblkid_LIBS@
+@@ -98,6 +98,12 @@ libblkid_LIBS = @libblkid_LIBS@
  # Whether Sun RPC support is available.
  HAVE_SUN_RPC = @HAVE_SUN_RPC@
  
++# Whether pcap support is available.
++HAVE_PCAP = @HAVE_PCAP@
++
 +# Whether libpciaccess is available.
 +LIBPCIACCESS = @LIBPCIACCESS@
 +

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