Hi Efraim, Thank you for reviewing this patch. I attached a new version of the patch. I'll address your comments inline. On Sun, 2022-05-29 at 15:44 +0300, Efraim Flashner wrote: > ... > On Fri, May 27, 2022 at 12:47:18PM +0200, Roel Janssen wrote: > > From 1f3b9db55cac790711ece613f5ebeb51474764a7 Mon Sep 17 00:00:00 2001 > > From: Roel Janssen > > Date: Fri, 27 May 2022 12:40:46 +0200 > > Subject: [PATCH] gnu: virtuoso-ose: Update to 7.2.7. > > > > * gnu/packages/databases.scm (virtuoso-ose): Update to 7.2.7; Run autogen > >   after applying the patch below. > > * gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch: > >   New file. > > --- > >  gnu/packages/databases.scm                    |  26 +++- > >  ...tuoso-ose-remove-pre-built-jar-files.patch | 117 ++++++++++++++++++ > >  2 files changed, 141 insertions(+), 2 deletions(-) > >  create mode 100644 gnu/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch > > > > diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm > > index 2161340ef9..58b6dd088c 100644 > > --- a/gnu/packages/databases.scm > > +++ b/gnu/packages/databases.scm > > @@ -100,6 +100,7 @@ (define-module (gnu packages databases) > >    #:use-module (gnu packages gnome) > >    #:use-module (gnu packages gnupg) > >    #:use-module (gnu packages golang) > > +  #:use-module (gnu packages gperf) > >    #:use-module (gnu packages gtk) > >    #:use-module (gnu packages guile) > >    #:use-module (gnu packages icu4c) > > @@ -3229,14 +3230,30 @@ (define-public python-lmdb > >  (define-public virtuoso-ose > >    (package > >      (name "virtuoso-ose") > > -    (version "7.2.6") > > +    (version "7.2.7") > >      (source > >       (origin > >         (method url-fetch) > >         (uri (string-append "mirror://sourceforge/virtuoso/virtuoso/" version "/" > >                             "virtuoso-opensource-" version ".tar.gz")) > >         (sha256 > > -        (base32 "0ly7s7a3w2a2zhhi9rq9k2qlnzapqbbc1rcdqb3zqqpgg81krz9q")))) > > +        (base32 "1853ln0smiilf3pni70gq6nmi9ps039cy44g6b5i9d2z1n9hnj02")) > > +       (patches (search-patches "virtuoso-ose-remove-pre-built-jar-files.patch")) > > +       (modules '((guix build utils))) > > +       ;; This snippet removes pre-built Java archives. > > +       (snippet > > +        '(begin > > +           (delete-file-recursively "libsrc/JDBCDriverType4") > > +           (delete-file-recursively "binsrc/hibernate") > > +           (delete-file-recursively "binsrc/jena") > > +           (delete-file-recursively "binsrc/jena2") > > +           (delete-file-recursively "binsrc/jena3") > > +           (delete-file-recursively "binsrc/jena4") > > +           (delete-file-recursively "binsrc/rdf4j") > > +           (delete-file-recursively "binsrc/sesame") > > +           (delete-file-recursively "binsrc/sesame2") > > +           (delete-file-recursively "binsrc/sesame3") > > +           (delete-file-recursively "binsrc/sesame4"))))) > > how about > (for-each delete-file-recursively >   (list "libsrc/JDBCDriverType4" >         "binsrc/hibernate" >         ...)) > I adapted this in the new patch. > >      (build-system gnu-build-system) > >      (arguments > >       `(#:tests? #f ; Tests require a network connection. > > @@ -3247,6 +3264,9 @@ (define-public virtuoso-ose > >                             "--enable-static=no") > >         #:phases > >         (modify-phases %standard-phases > > +         (add-before 'configure 'autogen > > +           (lambda _ > > +             (invoke "./autogen.sh"))) > > This would probably be better as (replace 'bootstrap > I adapted this in the new patch. > >           ;; 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 > > @@ -3256,6 +3276,8 @@ (define-public virtuoso-ose > >                             (delete-file (string-append lib "/" file))) > >                           '("libvirtuoso-t.a" > >                             "libvirtuoso-t.la")))))))) > > +    (native-inputs > > +     (list autoconf automake libtool bison flex gperf)) > > That's more than I expected! Yes, it's unfortunate that we apply changes to the build system code. :) Without any of these, the build fails. > > ... Kind regards, Roel Janssen