summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-05-12 12:12:13 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-05-12 12:12:13 +0000
commit402618038bc648eb7f271e69038e485f3ed49301 (patch)
tree8496697a0d58b0034f56add776b393e2a7dc5ee0 /dev-java
parentStable on alpha, bug #415435 (diff)
downloadhistorical-402618038bc648eb7f271e69038e485f3ed49301.tar.gz
historical-402618038bc648eb7f271e69038e485f3ed49301.tar.bz2
historical-402618038bc648eb7f271e69038e485f3ed49301.zip
Add missing ecj-gcj-3.6. Thanks to genstorm
Package-Manager: portage-2.1.10.58/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ecj-gcj/ChangeLog5
-rw-r--r--dev-java/ecj-gcj/Manifest17
-rwxr-xr-xdev-java/ecj-gcj/files/ecj-gcj-3.621
3 files changed, 34 insertions, 9 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/Manifest b/dev-java/ecj-gcj/Manifest
index 339ee9894b06..287e819e928a 100644
--- a/dev-java/ecj-gcj/Manifest
+++ b/dev-java/ecj-gcj/Manifest
@@ -2,20 +2,21 @@
Hash: SHA1
AUX ecj-gcj-3.5 723 RMD160 fb62d5bf35ef27f96c574b774410a0a1931d0e2d SHA1 713b2a237296af6d6745d31bf21447a0f4faeeb6 SHA256 6272829cdc298abd20683a78d3d159bcd4c29f96478e20428d4214c743cce21b
+AUX ecj-gcj-3.6 723 RMD160 2de4ad1430a11e7196f3b6429f962d60de15a371 SHA1 202825118eeed06bfd831fc1cdbd6396f086d460 SHA256 0c6993347ba1af785bec6920a0c9c473fee779fee31e7bacc41cd3696d3a6da3
DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74
DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242
EBUILD ecj-gcj-3.5.2-r2.ebuild 2790 RMD160 5813b257d32760fc443625aae12a563933ec7ca7 SHA1 2a4a38b0999d628c53d469f37e1c62bb14c36e50 SHA256 4a93bf9d49d9ef0bb8c5272661601812b98884a33db39b7f51646ed459a759ca
EBUILD ecj-gcj-3.6.ebuild 2805 RMD160 93292100cd2d32e3dd2b4a37ce895369eb611210 SHA1 04e394eda11ca7bfee64f54d52de845a883c201a SHA256 4881e6daaffd4f0bdcdc91b91bdcf60b4239d8aff70489d5a977b35d0e6e4a3a
-MISC ChangeLog 1681 RMD160 115a4e819bf15667bab295c5e69f36ef6d5d26ae SHA1 768bb024d8521da724b13f6eccc8dacfe05e46b4 SHA256 1d0464b11d474478b41e89d2b5be446a768ddd4fd9df35fa35b84fd5505243fc
+MISC ChangeLog 1798 RMD160 f2e29e676720b7763a836e0d9a3f24449b092f52 SHA1 382a20080da09f3253fbb8d52303065758192dbd SHA256 8459db5ea4070d0043991de1117991d6c457ec091504d12a010859df55e86a0b
MISC metadata.xml 328 RMD160 d09d8ec2e29ba96d03ede0ce6ddfc93c07c3436f SHA1 3a1c230643120b795fa9e2d835bb817b44dd560e SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJPprfaAAoJEIUJ+svaV163SMYIAI1ovl3+EsQD8MlaMWY8g08X
-RhyWJ4lwkogzhWrDETANso3rfiQBz1Urwa89mMoj/pUo67N3HsDH1hW7hkXNlXiO
-Z+oIg3t1QLrCgAWIqtD1RX4trmfd2fRIz44paWM0HmeC/vN59tZCKVsAIq4sSMlB
-l/w2xfyivb/V+q92lkmoHTCSy1SOO+PPpMm2o6G/V3AqILLVF3NiQcHSOl4SWxcb
-F+qsHPPAQG+ilIeAqjTs0nk8MTtDiVWBMfdpFqShdK3iYlHMW4iSnp0JwBn/N8Fz
-s1RLsr4Byc6HHO97/lxOV1kyV9tzEG8BV2bFLkXxhJVrN6DC702hetHvUGQpiiA=
-=CjMT
+iQEcBAEBAgAGBQJPrlOtAAoJEIUJ+svaV163i70IAKhIOruPNCGIZCAZeJ8LVfns
+mo+1KdXH+BLi66fQKKMaPObZt0eV5b27hwWjz8wjf93wsrZapMuJSmxwy/yZeYYW
+gePaKqtxm6L148oumDZmCmdceTlld9Yn2dNfuEdp/og5chIS+7SANxOTitEPa4lP
+vMM61WzCUd9Il10OWm7CRXMocyN8C+krwOGxTA1mGuZC5blh9ny/QlSUnRh4Wyb8
+g2jN5DjT9PF4rev0aD8+f1uUbQo32lRM0/MeOrP3CJwOalC2Ye+XEqY/VdYx80j4
+HDffK8ocw2lkkoumptMAtOE1h7A4wgSFCsZOPZlD9DZrrBgBSq2YquBVBoLYBj8=
+=hw7d
-----END PGP SIGNATURE-----
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 "${@}"