[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] gnu: bridge-utils: Fix build system.
From: |
David Thompson |
Subject: |
[PATCH] gnu: bridge-utils: Fix build system. |
Date: |
Thu, 07 May 2015 08:31:20 -0400 |
User-agent: |
Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) |
Our bridge-utils build is totally broken, but was failing silently due
to issues with the Makefile. Now it actually builds 'brctl'. :)
>From 7a7a10874ae8ffb34c9edcb021b579d6bf0a287c Mon Sep 17 00:00:00 2001
From: David Thompson <address@hidden>
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
--
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate
- [PATCH] gnu: bridge-utils: Fix build system.,
David Thompson <=