me
/
guix
Archived
1
0
Fork 0
Code

gnu: icedtea6: patch patches in separate build phase. 

* gnu/packages/java.scm (icedtea6)[arguments]: Move patching of patches from
  ‘patch-paths’ to new ‘patch-patches’ phase.
master
Ricardo Wurmus 2015-03-10 14:05:48 +01:00
parent 6f27f3775e
commit 4d80586aa5
1 changed files with 85 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/java.scm
View File

@ -192,7 +192,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
"openjdk6-src.tar.xz") "openjdk6-src.tar.xz")
(zero? (system* "tar" "xvf" "openjdk6-src.tar.xz")))))) (zero? (system* "tar" "xvf" "openjdk6-src.tar.xz"))))))
(alist-cons-after (alist-cons-after
'unpack 'patch-paths 'unpack 'patch-patches
(lambda _ (lambda _
;; shebang in patches so that they apply cleanly ;; shebang in patches so that they apply cleanly
(substitute* '("patches/jtreg-jrunscript.patch" (substitute* '("patches/jtreg-jrunscript.patch"
@ -204,8 +204,10 @@ build process and its dependencies, whereas Make uses Makefile format.")
(("ALSA_INCLUDE=/usr/include/alsa/version.h") (("ALSA_INCLUDE=/usr/include/alsa/version.h")
(string-append "ALSA_INCLUDE=" (string-append "ALSA_INCLUDE="
(assoc-ref %build-inputs "alsa-lib") (assoc-ref %build-inputs "alsa-lib")
"/include/alsa/version.h"))) "/include/alsa/version.h"))))
(alist-cons-after
'unpack 'patch-paths
(lambda _
;; buildtree.make generates shell scripts, so we need to replace ;; buildtree.make generates shell scripts, so we need to replace
;; the generated shebang ;; the generated shebang
(substitute* '("openjdk/hotspot/make/linux/makefiles/buildtree.make") (substitute* '("openjdk/hotspot/make/linux/makefiles/buildtree.make")
@ -422,7 +424,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(copy-recursively "openjdk.build/docs" doc) (copy-recursively "openjdk.build/docs" doc)
(copy-recursively "openjdk.build/j2re-image" jre) (copy-recursively "openjdk.build/j2re-image" jre)
(copy-recursively "openjdk.build/j2sdk-image" jdk))) (copy-recursively "openjdk.build/j2sdk-image" jdk)))
%standard-phases)))))))) %standard-phases)))))))))
(native-inputs (native-inputs
`(("ant-bootstrap" `(("ant-bootstrap"
,(origin ,(origin