diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-18 18:11:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-18 18:11:02 +0100 |
| commit | 381c540b937a5e6e8b7007c9c0271ee816bf5417 (patch) | |
| tree | 27191f25f05bbfd48dbf47bbd29f72cb7521482f /gnu/packages/rdf.scm | |
| parent | 49689377a3bab8da08436455ca14a0432fa0e95f (diff) | |
| parent | f401b1e9934a6594d6d7586922aa987e0b24839b (diff) | |
| download | guix-381c540b937a5e6e8b7007c9c0271ee816bf5417.tar guix-381c540b937a5e6e8b7007c9c0271ee816bf5417.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/rdf.scm')
| -rw-r--r-- | gnu/packages/rdf.scm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index a76b2c30ab..96a52fd93a 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -19,7 +19,7 @@ (define-module (gnu packages rdf) #:use-module ((guix licenses) - #:select (bsd-style isc gpl2 lgpl2.0+ lgpl2.1 lgpl2.1+)) + #:select (non-copyleft isc gpl2 lgpl2.0+ lgpl2.1 lgpl2.1+)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) @@ -127,24 +127,24 @@ Java Lucene text search engine API to C++.") (build-system gnu-build-system) (arguments '(#:phases (alist-cons-after - 'unpack 'remove-out-of-tree-references + 'remove-out-of-tree-references 'autoreconf (lambda _ - ;; remove symlinks to files in /usr/ - (delete-file-recursively "m4") - (for-each delete-file '("config.guess" - "config.sub" - "depcomp" - "install-sh" - "ltmain.sh" - "missing")) - ;; remove_test depends on an out-of-tree RDF file - (substitute* "examples/Makefile.am" - (("instances_test remove_test") "instances_test") - (("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) + (zero? (system* "autoreconf" "-vfi"))) (alist-cons-after - 'remove-out-of-tree-references 'autoreconf + 'unpack 'remove-out-of-tree-references (lambda _ - (zero? (system* "autoreconf" "-vfi"))) + ;; remove symlinks to files in /usr/ + (delete-file-recursively "m4") + (for-each delete-file '("config.guess" + "config.sub" + "depcomp" + "install-sh" + "ltmain.sh" + "missing")) + ;; remove_test depends on an out-of-tree RDF file + (substitute* "examples/Makefile.am" + (("instances_test remove_test") "instances_test") + (("\\$\\(TESTS\\) remove_test") "$(TESTS)"))) %standard-phases)))) (inputs `(("raptor" ,raptor2) @@ -338,7 +338,7 @@ system.") (description "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information.") - (license (bsd-style "file://LICENSE" + (license (non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) (define-public python2-rdflib |