[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: gnu: icedtea6: patch ant shebang in unpack phase
From: |
Ricardo Wurmus |
Subject: |
01/06: gnu: icedtea6: patch ant shebang in unpack phase |
Date: |
Mon, 23 Mar 2015 09:17:56 +0000 |
rekado pushed a commit to branch master
in repository guix.
commit f9e62ad221a9f059f78b4f2800d48cf893de10dd
Author: Ricardo Wurmus <address@hidden>
Date: Tue Mar 10 13:56:55 2015 +0100
gnu: icedtea6: patch ant shebang in unpack phase
* gnu/packages/java.scm (icedtea6)[arguments]: patch bootstrap ant in the
`unpack' phase instead of `patch-paths'.
---
gnu/packages/java.scm | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 29f628c..7f841f0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -184,6 +184,7 @@ build process and its dependencies, whereas Make uses
Makefile format.")
(zero? (system* "tar" "xvjf"
(assoc-ref inputs "ant-bootstrap")))
(begin
+ (patch-shebang "apache-ant-1.9.4/bin/ant")
(chdir (string-append ,name "-" ,version))
(mkdir "openjdk")
(with-directory-excursion "openjdk"
@@ -193,8 +194,6 @@ build process and its dependencies, whereas Make uses
Makefile format.")
(alist-cons-after
'unpack 'patch-paths
(lambda _
- (patch-shebang "../apache-ant-1.9.4/bin/ant")
-
;; shebang in patches so that they apply cleanly
(substitute* '("patches/jtreg-jrunscript.patch"
"patches/hotspot/hs23/drop_unlicensed_test.patch")
- branch master updated (e73b49f -> 6b2bad4), Ricardo Wurmus, 2015/03/23
- 02/06: gnu: icedtea6: patch hardcoded objcopy path., Ricardo Wurmus, 2015/03/23
- 05/06: gnu: icedtea6: Do not set CC and LD_LIBRARY_PATH., Ricardo Wurmus, 2015/03/23
- 04/06: gnu: icedtea6: Rename ‘set-paths’ phase to ‘set-additional-paths’, Ricardo Wurmus, 2015/03/23
- 03/06: gnu: icedtea6: patch patches in separate build phase., Ricardo Wurmus, 2015/03/23
- 01/06: gnu: icedtea6: patch ant shebang in unpack phase,
Ricardo Wurmus <=
- 06/06: gnu: icedtea6: remove commented substitution., Ricardo Wurmus, 2015/03/23