From 1647ee8c2f317d7c68ad1116741f931d0d1ebd5a Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 2 Jul 2019 12:23:04 -0500
Subject: gn: Octave@3.4.3: Build with glibc-2.28.

[inputs]: Add newer fseeko.c from gnulib, remove glibc-2.27.
[arguments]: Copy newer fseeko.c into place after unpacking.
---
 gn/packages/maths.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'gn/packages')

diff --git a/gn/packages/maths.scm b/gn/packages/maths.scm
index f57459d..52e2a28 100644
--- a/gn/packages/maths.scm
+++ b/gn/packages/maths.scm
@@ -3,7 +3,6 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
-  #:use-module (gnu packages base)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages texinfo)
@@ -39,6 +38,8 @@
                               "src/DLD-FUNCTIONS/convhulln.cc")
                  (("qhull/qhull.h") "libqhull/libqhull.h")
                  (("qhull/qhull_a.h") "libqhull/qhull_a.h"))
+               (copy-file (assoc-ref %build-inputs "fseeko.c")
+                          "libgnu/fseeko.c")
                #t))
            (replace 'configure-makeinfo
              (lambda* (#:key inputs #:allow-other-keys)
@@ -48,7 +49,13 @@
                     "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\"")))
                #t))))))
     (native-inputs
-     `(("glibc-2.27" ,glibc-2.27) ; works around fseeko.c problem in gnulib
+     `(("fseeko.c" ,(origin
+                      (method url-fetch)
+                      (uri "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/fseeko.c;hb=d40db5e23197dcd105fa3c0dc6633b51af3c08d9")
+                      (file-name "gnulib-fseeko.c-0.0.0-1-d40db5e23")
+                      (sha256
+                       (base32
+                        "1ifa5200pskgdzd6qi4nicwyjjkc415bs403mjrrzv8cdrf6hp3k"))))
        ,@(fold alist-delete (package-native-inputs octave-cli)
                '("lzip"))))
     (inputs
-- 
cgit v1.2.3