diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-05-12 12:12:13 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-05-12 12:12:13 +0000 |
| commit | 2ecdfaf799067660c3f835d921f71793a96698e5 (patch) | |
| tree | a5a9d0abdd06992ff56457a365b3c07324a42f32 /dev-java | |
| parent | Stable on alpha, bug #415435 (diff) | |
| download | gentoo-2-2ecdfaf799067660c3f835d921f71793a96698e5.tar.gz gentoo-2-2ecdfaf799067660c3f835d921f71793a96698e5.tar.bz2 gentoo-2-2ecdfaf799067660c3f835d921f71793a96698e5.zip | |
Add missing ecj-gcj-3.6. Thanks to genstorm
(Portage version: 2.1.10.58/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/ecj-gcj/ChangeLog | 5 | ||||
| -rwxr-xr-x | dev-java/ecj-gcj/files/ecj-gcj-3.6 | 21 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog index 0d398ee0f75b..75cd34dc5d34 100644 --- a/dev-java/ecj-gcj/ChangeLog +++ b/dev-java/ecj-gcj/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/ecj-gcj # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.3 2012/05/06 17:41:31 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.4 2012/05/12 12:12:13 sera Exp $ + + 12 May 2012; Ralph Sennhauser <sera@gentoo.org> +files/ecj-gcj-3.6: + Add missing ecj-gcj-3.6. Thanks to genstorm *ecj-gcj-3.6 (06 May 2012) diff --git a/dev-java/ecj-gcj/files/ecj-gcj-3.6 b/dev-java/ecj-gcj/files/ecj-gcj-3.6 new file mode 100755 index 000000000000..a9725e55b4bd --- /dev/null +++ b/dev-java/ecj-gcj/files/ecj-gcj-3.6 @@ -0,0 +1,21 @@ +#!/bin/bash +# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular +# so we fallback to gcc-config discovery +GIJ_BIN="/usr/bin/gij" +if [[ ! -f ${GIJ_BIN} ]]; then + GIJ_BIN="$(gcc-config -B)/gij" +fi +if [[ ! -f ${GIJ_BIN} ]]; then + echo "gij not found! check that gcc is compiled with gcj flag" + exit 1 +fi +# calling java-config would be an unnecessary slowdown here + +# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter +# this breaks e.g. bootstrap of ant-core +ecj_cp="/usr/share/ecj-gcj-3.6/lib/ecj.jar" +if [[ -n "${CLASSPATH}" ]]; then + ecj_cp="${ecj_cp}:${CLASSPATH}" +fi + +${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}" |