summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-02-17 23:08:53 +0100
committerLudovic Courtès <ludo@gnu.org>2018-02-18 00:48:16 +0100
commita9d4a9ad332a1568d2abf2e47e68e590f32b386f (patch)
treee5aa02e38f8ad7a347bb3448ba2a3293c8a2009e
parentbfb06e580e3ff497e057e2d85f95b2fe9f7f908b (diff)
downloadpatches-a9d4a9ad332a1568d2abf2e47e68e590f32b386f.tar
patches-a9d4a9ad332a1568d2abf2e47e68e590f32b386f.tar.gz
gnu: gvpe: Fix compilation against glibc 2.26.
* gnu/packages/vpn.scm (gvpe)[source](modules, snippet): New fields.
-rw-r--r--gnu/packages/vpn.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index c8e82cf869..d7f5dc6597 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
@@ -52,7 +52,17 @@
version ".tar.gz"))
(sha256
(base32
- "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"))))
+ "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove the outdated bundled copy of glibc's getopt, which
+ ;; provides a 'getopt' declaration that conflicts with that
+ ;; of glibc 2.26.
+ (substitute* "lib/Makefile.in"
+ (("getopt1?\\.(c|h|\\$\\(OBJEXT\\))") ""))
+ (for-each delete-file
+ '("lib/getopt.h" "lib/getopt.c"))))))
(build-system gnu-build-system)
(home-page "http://software.schmorp.de/pkg/gvpe.html")
(inputs `(("openssl" ,openssl)