diff options
| author | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2017-06-15 14:43:35 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-06-15 17:24:34 +0200 |
| commit | c4fd86f9c1efdb6b413dd6b7a00f03a5f9558b8d (patch) | |
| tree | 44349e6f6474c15ed347311031733ae14663b774 | |
| parent | 240cee8ab42efd77b1a7962173209e9678f2f019 (diff) | |
| download | patches-c4fd86f9c1efdb6b413dd6b7a00f03a5f9558b8d.tar patches-c4fd86f9c1efdb6b413dd6b7a00f03a5f9558b8d.tar.gz | |
gnu: sablevm: Do not use bundled libraries.
* gnu/packages/java.scm (sablevm)[inputs]: Add popt and libffi.
[arguments]: Add configure flags and build phase to avoid using bundled
libraries.
| -rw-r--r-- | gnu/packages/java.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9a129b8d91..1496af7591 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -51,10 +51,12 @@ #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages libffi) #:use-module (gnu packages linux) ;alsa #:use-module (gnu packages wget) #:use-module (gnu packages pkg-config) #:use-module (gnu packages perl) + #:use-module (gnu packages popt) #:use-module (gnu packages kerberos) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -160,8 +162,17 @@ This package provides the classpath library.") "1jyg4bsym6igz94wps5443c7wiwlzinqzkchcw972nz4kf1cql6g")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list "--with-internal-libffi=no" + "--with-internal-libpopt=no") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'link-with-popt + (lambda _ + (substitute* "src/sablevm/Makefile.in" + (("\\$\\(SVMADD\\)" match) + (string-append match " -lpopt"))) + #t)) (add-after 'unpack 'patch-path-to-classpath (lambda* (#:key inputs #:allow-other-keys) (substitute* "Makefile.in" @@ -179,7 +190,9 @@ This package provides the classpath library.") (inputs `(("classpath" ,sablevm-classpath) ("jikes" ,jikes) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("popt" ,popt) + ("libffi" ,libffi))) (native-inputs `(("libltdl" ,libltdl))) (home-page "http://sablevm.org/") |