[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: icedtea6: patch hardcoded objcopy path.
From: |
Ricardo Wurmus |
Subject: |
02/06: gnu: icedtea6: patch hardcoded objcopy path. |
Date: |
Mon, 23 Mar 2015 09:17:57 +0000 |
rekado pushed a commit to branch master
in repository guix.
commit 6f27f3775e0bad87fb1d9bf5107f81d17d2dc630
Author: Ricardo Wurmus <address@hidden>
Date: Tue Mar 10 14:00:55 2015 +0100
gnu: icedtea6: patch hardcoded objcopy path.
* gnu/packages/java.scm (icedtea6)[arguments]: patch Makefile to override
DEF_OBJCOPY variable definition.
---
gnu/packages/java.scm | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7f841f0..84ac822 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -227,7 +227,9 @@ build process and its dependencies, whereas Make uses
Makefile format.")
(string-append "DEVTOOLS_PATH = " corebin))
(("COMPILER_PATH *= */usr/bin/")
(string-append "COMPILER_PATH = "
- (assoc-ref %build-inputs "gcc") "/bin/")))
+ (assoc-ref %build-inputs "gcc") "/bin/"))
+ (("DEF_OBJCOPY *=.*objcopy")
+ (string-append "DEF_OBJCOPY = " (which "objcopy"))))
;; fix hard-coded utility paths
(substitute* '("openjdk/jdk/make/common/shared/Defs-utils.gmk"
- branch master updated (e73b49f -> 6b2bad4), Ricardo Wurmus, 2015/03/23
- 02/06: gnu: icedtea6: patch hardcoded objcopy path.,
Ricardo Wurmus <=
- 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, 2015/03/23
- 06/06: gnu: icedtea6: remove commented substitution., Ricardo Wurmus, 2015/03/23