aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDavid Thompson <davet@gnu.org>2015-05-06 17:00:07 -0400
committerDavid Thompson <dthompson2@worcester.edu>2015-05-07 10:44:42 -0400
commite5c8e4f3618e003ffee87f42deb0d3b3311bff6a (patch)
tree2f01d9563eabafabbafbde1c155070d5cf52a2fc /gnu
parent105369a46b6baf94aec5382cad6c70509e3ce1fc (diff)
downloadguix-e5c8e4f3618e003ffee87f42deb0d3b3311bff6a.tar
guix-e5c8e4f3618e003ffee87f42deb0d3b3311bff6a.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux.scm11
1 files changed, 11 insertions, 0 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9ff753d571..62d27776e5 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