01/01: gnu: bridge-utils: Fix build system.

[David Thompson]

davexunit pushed a commit to branch master
in repository guix.

commit e5c8e4f3618e003ffee87f42deb0d3b3311bff6a
Author: David Thompson <address@hidden>
Date:   Wed May 6 17:00:07 2015 -0400

    gnu: bridge-utils: Fix build system.
    
    * gnu/packages/linux.scm (bridge-utils): Patch source to fix compilation
      error.  Patch Makefile to fail in case of future compilation errors.
---
 gnu/packages/linux.scm |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9ff753d..62d2777 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1033,6 +1033,17 @@ Linux-based operating systems.")
      '(#:phases (alist-cons-after
                  'unpack 'bootstrap
                  (lambda _
+                   ;; Fix "field ‘ip6’ has incomplete type" errors.
+                   (substitute* "libbridge/libbridge.h"
+                     (("#include <linux/if_bridge.h>")
+                      "#include <linux/in6.h>\n#include <linux/if_bridge.h>"))
+
+                   ;; Ensure that the entire build fails if one of the
+                   ;; sub-Makefiles fails.
+                   (substitute* "Makefile.in"
+                     (("\\$\\(MAKE\\) \\$\\(MFLAGS\\) -C \\$\\$x ;")
+                      "$(MAKE) $(MFLAGS) -C $$x || exit 1;"))
+
                    (zero? (system* "autoreconf" "-vf")))
                  %standard-phases)
        #:tests? #f))                              ; no 'check' target