From ae8a4de1417887759d383645b040b5d7b06c0a44 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 9 Jul 2023 02:00:02 +0200 Subject: [PATCH] gnu: virtuoso-ose: Use G-expressions. * gnu/packages/databases.scm (virtuoso-ose)[arguments]: Rewrite as G-expressions. --- gnu/packages/databases.scm | 128 +++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d95b363249..6e8fe4cfb6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3333,71 +3333,73 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (modules '((guix build utils))) ;; This snippet removes pre-built Java archives. (snippet - '(for-each delete-file-recursively - (list "binsrc/hibernate" - "binsrc/jena" - "binsrc/jena2" - "binsrc/jena3" - "binsrc/jena4" - "binsrc/rdf4j" - "binsrc/sesame" - "binsrc/sesame2" - "binsrc/sesame3" - "binsrc/sesame4" - "libsrc/JDBCDriverType4"))))) + #~(for-each delete-file-recursively + (list "binsrc/hibernate" + "binsrc/jena" + "binsrc/jena2" + "binsrc/jena3" + "binsrc/jena4" + "binsrc/rdf4j" + "binsrc/sesame" + "binsrc/sesame2" + "binsrc/sesame3" + "binsrc/sesame4" + "libsrc/JDBCDriverType4"))))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; Tests require a network connection. - ;; TODO: Removing the libsrc/zlib source directory breaks the build. - ;; This indicates that the internal zlib code may still be used. - #:configure-flags '("--without-internal-zlib" - "--with-readline" - "--enable-static=no") - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "sh" "autogen.sh"))) - (add-after 'unpack 'avoid-embedding-kernel-and-timestamps - ;; For a reproducible build, avoid embedding the kernel version and - ;; timestamps. - (lambda _ - (substitute* - (list "bin/makever" - "appsrc/ODS-Polls/make_vad.sh" - "appsrc/ODS-Blog/make_vad.sh" - "appsrc/ODS-Community/make_vad.sh" - "appsrc/ODS-Framework/make_vad.sh" - "appsrc/ODS-Framework/oauth/make_vad.sh" - "appsrc/ODS-WebMail/make_vad.sh" - "appsrc/ODS-Calendar/make_vad.sh" - "appsrc/ODS-Gallery/make_vad.sh" - "appsrc/ODS-Briefcase/make_vad.sh" - "appsrc/ODS-FeedManager/make_vad.sh" - "appsrc/ODS-Bookmark/make_vad.sh" - "appsrc/ODS-Addressbook/make_vad.sh" - "binsrc/dbpedia/make_vad.sh" - "binsrc/samples/demo/make_vad.sh" - "binsrc/samples/demo/mkdoc.sh" - "binsrc/samples/sparql_demo/make_vad.sh" - "binsrc/bpel/make_vad.sh" - "binsrc/fct/make_vad.sh" - "binsrc/rdf_mappers/make_vad.sh" - "binsrc/isparql/make_vad.sh" - "binsrc/conductor/mkvad.sh") - (("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n") - (("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n") - (("^PACKDATE=.*") "PACKDATE=2012-04-18\n") - (("^DATE=.*") "DATE=2012-04-18\n")))) - ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in - ;; the build output. The following phase removes it. - (add-after 'install 'remove-static-libs - (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) - (for-each (lambda (file) - (delete-file (string-append lib "/" file))) - '("libvirtuoso-t.a" - "libvirtuoso-t.la")))))))) + (list + #:tests? #f ; tests require a network connection + ;; TODO: Removing the libsrc/zlib source directory breaks the build. + ;; This indicates that the internal zlib code may still be used. + #:configure-flags + #~(list "--without-internal-zlib" + "--with-readline" + "--enable-static=no") + #:phases + #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "sh" "autogen.sh"))) + (add-after 'unpack 'avoid-embedding-kernel-and-timestamps + ;; For a reproducible build, avoid embedding the kernel version and + ;; timestamps. + (lambda _ + (substitute* + (list "bin/makever" + "appsrc/ODS-Polls/make_vad.sh" + "appsrc/ODS-Blog/make_vad.sh" + "appsrc/ODS-Community/make_vad.sh" + "appsrc/ODS-Framework/make_vad.sh" + "appsrc/ODS-Framework/oauth/make_vad.sh" + "appsrc/ODS-WebMail/make_vad.sh" + "appsrc/ODS-Calendar/make_vad.sh" + "appsrc/ODS-Gallery/make_vad.sh" + "appsrc/ODS-Briefcase/make_vad.sh" + "appsrc/ODS-FeedManager/make_vad.sh" + "appsrc/ODS-Bookmark/make_vad.sh" + "appsrc/ODS-Addressbook/make_vad.sh" + "binsrc/dbpedia/make_vad.sh" + "binsrc/samples/demo/make_vad.sh" + "binsrc/samples/demo/mkdoc.sh" + "binsrc/samples/sparql_demo/make_vad.sh" + "binsrc/bpel/make_vad.sh" + "binsrc/fct/make_vad.sh" + "binsrc/rdf_mappers/make_vad.sh" + "binsrc/isparql/make_vad.sh" + "binsrc/conductor/mkvad.sh") + (("^UNAME_SYSTEM=.*") "UNAME_SYSTEM=unknown\n") + (("^UNAME_RELEASE=.*") "UNAME_RELEASE=unknown\n") + (("^PACKDATE=.*") "PACKDATE=2012-04-18\n") + (("^DATE=.*") "DATE=2012-04-18\n")))) + ;; Even with "--enable-static=no", "libvirtuoso-t.a" is left in + ;; the build output. The following phase removes it. + (add-after 'install 'remove-static-libs + (lambda _ + (for-each + (lambda (file) + (delete-file (string-append #$output "/lib/" file))) + '("libvirtuoso-t.a" + "libvirtuoso-t.la"))))))) (native-inputs (list autoconf automake bison flex gperf libtool)) (inputs