diff options
| author |   Alexander Huemer <alexander.huemer@sbg.ac.at> | 2009-04-24 16:56:37 +0200 |
|---|---|---|
| committer | Alexander Huemer <alexander.huemer@sbg.ac.at> | 2009-04-24 16:56:37 +0200 |
| commit | df375dd73432706418d52ca0284168123d70a818 (patch) | |
| tree | 1165f811a8132f532032118a3ba7a7619a4d1f56 /eclass | |
| parent | corrected some KEYWORDS of ebuilds imported from other overlays. small mod of... (diff) | |
| parent | Fix sandbox violation from java-utils-2.eclass when gcj-jdk isn't (diff) | |
| download | multilib-portage-df375dd73432706418d52ca0284168123d70a818.tar.gz multilib-portage-df375dd73432706418d52ca0284168123d70a818.tar.bz2 multilib-portage-df375dd73432706418d52ca0284168123d70a818.zip | |
Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 66c958d59..e68231a89 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2675,7 +2675,7 @@ java-pkg_gcjflags() { strip-flags filter-flags "-ftree-loop-distribution -ftree-vectorize" filter-flags "-D*" - replace-flags "-O?" "-O0" + replace-flags "-O?" "-O1" append-flags -w filter-ldflags -Wl,--as-needed --as-needed @@ -2886,8 +2886,7 @@ java-pkg_native-set-env() { # Construct the gcj-jdk JAVA_HOME in the same way as the gcj-jdk # ebuild just in case it's not installed yet gcj_java_home="/usr/$(get_libdir)/gcj-jdk-${gcc_slot}-${libgcj_abi_version}" - # Create the directory if it doesn't already exist - [[ -d "${gcj_java_home}" ]] || mkdir -p "${gcj_java_home}" + [[ -d "${gcj_java_home}" ]] || die "dev-java/gcj-jdk-${gcc_slot} is needed to compile native packages with gcj" JAVA_PKG_NATIVE_BIN_FLAGS="-Wl,-rpath ${gcj_java_home}/lib/${ABI} -Wl,-Bsymbolic -findirect-dispatch -fjni" export GCJ="${gccbin}/gcj" |