02/04: gnu: gvpe: Fix compilation against glibc 2.26.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit a9d4a9ad332a1568d2abf2e47e68e590f32b386f
Author: Ludovic Courtès <address@hidden>
Date:   Sat Feb 17 23:08:53 2018 +0100

    gnu: gvpe: Fix compilation against glibc 2.26.
    
    * gnu/packages/vpn.scm (gvpe)[source](modules, snippet): New fields.
---
 gnu/packages/vpn.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index c8e82cf..d7f5dc6 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 <address@hidden>
-;;; Copyright © 2013, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2016, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Jeff Mickey <address@hidden>
 ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
@@ -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)