[PATCH] gnu: bridge-utils: Fix build system.

[PATCH] gnu: bridge-utils: Fix build system.

[David Thompson]

[-- Attachment #1: Type: text/plain, Size: 137 bytes --]

Our bridge-utils build is totally broken, but was failing silently due
to issues with the Makefile.  Now it actually builds 'brctl'. :)


[-- Attachment #2: 0001-gnu-bridge-utils-Fix-build-system.patch --]
[-- Type: text/x-diff, Size: 1507 bytes --]

From 7a7a10874ae8ffb34c9edcb021b579d6bf0a287c Mon Sep 17 00:00:00 2001
From: David Thompson <davet@gnu.org>
Date: Wed, 6 May 2015 17:00:07 -0400
Subject: [PATCH] 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 file changed, 11 insertions(+)

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
-- 
2.1.4


[-- Attachment #3: Type: text/plain, Size: 136 bytes --]


-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH] gnu: bridge-utils: Fix build system.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 7a7a10874ae8ffb34c9edcb021b579d6bf0a287c Mon Sep 17 00:00:00 2001
> From: David Thompson <davet@gnu.org>
> Date: Wed, 6 May 2015 17:00:07 -0400
> Subject: [PATCH] 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.

Looks good; thanks!

Ludo’.