[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: classpath-devel: Make build more robust.
From: |
Ricardo Wurmus |
Subject: |
01/01: gnu: classpath-devel: Make build more robust. |
Date: |
Mon, 26 Mar 2018 06:09:13 -0400 (EDT) |
rekado pushed a commit to branch rhel6
in repository guix.
commit 3b749957ac9872ce356012c84665f02c1278ae03
Author: Ricardo Wurmus <address@hidden>
Date: Mon Mar 26 12:08:01 2018 +0200
gnu: classpath-devel: Make build more robust.
* gnu/packages/java.scm (classpath-devel)[arguments]: Add build phases
"create-directories" and "fix-header-generation".
---
gnu/packages/java.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0fb87d4..399e01d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -566,6 +566,23 @@ machine.")))
(substitute* (find-files "java" "\\.java$")
(("@Override") ""))
#t))
+ ;; javac does not seem to create the target directories for class
+ ;; files quickly enough at compile time, so we create them in
+ ;; advance.
+ (add-after 'unpack 'create-directories
+ (lambda _
+ (substitute* "lib/Makefile.am"
+ (("./gen-classlist.sh standard" m)
+ (string-append m "&& cut -d' ' -f1 classes.1 | sort -u |
xargs mkdir -p\n")))
+ #t))
+ ;; javah is easily confused and won't create *GnomeDocument.h
+ ;; because it things we asked it to read the file it is supposed to
+ ;; generate.
+ (add-after 'unpack 'fix-header-generation
+ (lambda _
+ (substitute* "include/Makefile.am"
+ (("-o \\$@") ""))
+ #t))
(add-after 'install 'install-data
(lambda _ (zero? (system* "make" "install-data")))))))
(native-inputs