commit: 31773bdadf36b75d0c7124983d9093605a6a8223 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Thu Aug 28 14:54:33 2014 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Thu Aug 28 14:54:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=31773bda
Support gcc 4.9.1. Package-Manager: portage-2.2.11-r1 Manifest-Sign-Key: 248BDC07 --- dev-java/gcj-jdk/ChangeLog | 6 ++ dev-java/gcj-jdk/Manifest | 31 +++++----- dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild | 105 ++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 15 deletions(-) diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog index f6c3896..f604418 100644 --- a/dev-java/gcj-jdk/ChangeLog +++ b/dev-java/gcj-jdk/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*gcj-jdk-4.9.1 (28 Aug 2014) + + 28 Aug 2014; Andrew John Hughes <[email protected]> + +gcj-jdk-4.9.1.ebuild: + Support gcc 4.9.1. + *gcj-jdk-4.9.0 (07 Aug 2014) 07 Aug 2014; Andrew John Hughes <[email protected]> diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest index 07236ad..3b649cf 100644 --- a/dev-java/gcj-jdk/Manifest +++ b/dev-java/gcj-jdk/Manifest @@ -7,22 +7,23 @@ EBUILD gcj-jdk-4.6.4.ebuild 3680 SHA256 8c63f2ab224a7b39c73658cd92871ad012fcd910 EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb71375602d68bb1110d9493c47c09721 SHA512 bbd6ddd58d17fec3cc67e39396f1922ae52ae49240c6effd1021d58e06c2c53499f034134894080eedb1f2ec7657bfbde05aeb945993b01de54cac2417fbe5cd WHIRLPOOL 5b94a0c0bf7e779fbc1fda00f1bfb01c1294a0b7b287787c404eaf682452c99e5f51525e3fa77a197ff29686e5ad2fc02e0a9510e485609d45b0e88471cc5798 EBUILD gcj-jdk-4.8.2.ebuild 3743 SHA256 9fd0d79e3df75a6dd28aa05fbc17cebc9845b9f7d7f20443c0563cb918c7d2b5 SHA512 ad8b039e2dcd091304e03abc7a2e9117b6c78faa05fa82041ff4229019622fbdd895f60f7ae2cd7a24090e7440dff5588736ea5d44c26e51572a99f14634465b WHIRLPOOL 0b1437ceae94f01bdf0b8c54695e8d541f18f733863513b0874be3cd39445d0da1246094b4fa2701ffcfc55dd924488beb1d8a110acc884183bb588557f23aef EBUILD gcj-jdk-4.9.0.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88 -MISC ChangeLog 10560 SHA256 0a0e13599c0ba732e9d8d6a15343984cfb76e0baac17b61c5af3359af0955a79 SHA512 3309124b3ced6d1397456d7b985d764e12f96005f9c9695c2e4853ed1a82c993c7a4c528697ddbc7c019a440fcb995cad319aff7243ac916473595a670c63a01 WHIRLPOOL 62c615518fe5d7f75984b3542e0592ce6bc9cdd3c92b34a5537884ab31a7024ecc0d64a08d7a6d4fb2530c64dd5d3ad1938d4a0ca529400a129e3c00a08fa201 +EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88 +MISC ChangeLog 10699 SHA256 5fcd36ff8280256661c8f6f862073e9e5ea27bea18d35100a4f8ca26d8591a70 SHA512 f0a0c01dfb9306fe47858c81fddc0eaa6059f08ec90aea18cbfd6005d65e85782468cc787260634fd59fa81cedf5d93857c6e0c90c10de45d13fb5b9c19748f2 WHIRLPOOL b47b8a6d20cde5de0a0768dc70fc44e60f4ad344e95e66030f1bf4430f195cbd5aaf40abf8d477f61d1d1dfd9abe16ef09c2ddb74b6f0a6b97c2da8186645aec MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQIbBAEBCAAGBQJT48gLAAoJEDuWpXgki9wHX8YP9R5FjRE/6NB8aWd0AydWazZK -Bq5+k3kq76hJ1m7Oe3pNx5uwq11jrldP1Y67gpWdn9T7Mzhb/IJM1uG75m4to8Qe -C8Ikjduuw2mAiyRHZ1ZtjexHucCzt8VYpbfI1dtX8IG9pQz4Xv7N6pZpFMsBqMWM -26D4E5jXZiUfY2OdC47HVaq/uBiHEaU0t/hJikM1DPa8hdOf+cEDtcKnjkJXZGnL -E0VitDsCtZM5PZ4zCq+py6udaOsg6fQtsKcQlpWvv/WKs08bXq/HXI0GFUATrZXt -dXDWMFXdYDC0gzoW6w+7nrcZZV98CJfUuZ7PFUCd0vzBD1COMjGaYhJxibj/A0xC -zuKGcqKgZDXrqBA6eLvv+5K08XMom9jONo0y1AjGTjDxP7HxnG2FmAihpShVfT/u -rhtKCV1g6TVFo/ZW/t5YZh2kNVDSZCNwdhoxj1HIxt8f0ZDJXCazTR4dzWpe9D8L -/b6apQq4pjzoVdLwPYXAfavYBqXO0Dwg5nVhJe+ZY+tVbmt52tOfcHFOqJcYv26f -B8cLA3bVdvlipe/PBQTZUhpBI3e/xEINE8ygzfUGW9cNkS0DAnFiraS3s1KzRsvS -+rp+44zQRV83xZ91HXftl7UYI5ECyroKYVoDOBlGggHsxOBwhXyhVXuuWDwCT3dR -HEpdMGf3UJuRPXJQbbQ= -=jR9f +iQIcBAEBCAAGBQJT/0KpAAoJEDuWpXgki9wHhkEP/2ow6LxtA7pPW1uLpGVeTQCN +tItOg2kV35ji3yfC5D5utdLwD8SEqUpe/fb9YzMdkLiJiZNjcy2x7DCGvybOW6y5 +YfLRRON7JXBDTdQHZ6pYMwtnIthn2vy217oozeNzmAeUMAclLGpoyjGYpeZSU1i/ +3FPg76+68QkBNx8BkOqbitTCXdJUMNN+LrY5ikd1pLUu6PbGZYZZuM6x6OzswtJK +7n3ntv6kdK0uNLaVSjuzoarLSSL/fcTxdETdjFJkj+xpt7cbD9rbGKgHW7kQySP5 +Kkx3BXBu90FBTFeR6FnmlnwSXlpMb9M53ZwNyWqurqt2gNgKfMZ+NyuKHlCX8dWp +JaQ4iA5p82eMnnFJTrQONFkRccPzgplUcKW7jCPnDSkCTJcEDxcxu9UvC6M0NN1z +YbzMO554qulBUVyKGp1zAXgMdpCYQBCwV9eCpYyg/F7Q9qyYth5Ln78qyvqDr0hR +Mzou5xSO2BjAcUFvTMN+vlDWnYCgKS3zNrDDDTHmuQN258wTEVRnz/0P8QXm5OQ+ +kJ3nXHr4oqG6yONvxZRCSAUJ8sU/so3z8VKlgZpPBqojcRFMvbVUN920r9JdXRgl +uTJJinfLkkNFqRwz9NDEozW2OnHO70riYdwPxspCMcpU3gxueP8AT0sCCvuu9nq+ +EXHfslk8kdqVIJ+OcNhs +=1c4s -----END PGP SIGNATURE----- diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild new file mode 100644 index 0000000..7b06370 --- /dev/null +++ b/dev-java/gcj-jdk/gcj-jdk-4.9.1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $ + +EAPI="5" + +inherit java-vm-2 multilib + +DESCRIPTION="Java wrappers around GCJ" +HOMEPAGE="http://www.gentoo.org/"; +SRC_URI="" + +LICENSE="GPL-2" +KEYWORDS="" +SLOT="0" +IUSE="X" + +ECJ_GCJ_SLOT="4.2" + +RDEPEND=" + ~sys-devel/gcc-${PV}[gcj] + X? ( ~sys-devel/gcc-${PV}[awt] ) + dev-java/ecj-gcj:${ECJ_GCJ_SLOT}" +DEPEND="${RDEPEND}" + +S="${WORKDIR}" + +src_install() { + # jre lib paths ... + local libarch="$(get_system_arch)" + local gcc_version=${PV} + local gccbin=$(gcc-config -B ${gcc_version}) + gccbin=${gccbin#"${EPREFIX}"} + local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1) + gcclib=${gcclib#"${EPREFIX}"} + local gcjhome="/usr/$(get_libdir)/${P}" + local gccchost="${CHOST}" + local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*) + gcjlibdir=${gcjlibdir#"${EPREFIX}"} + + # links + dodir ${gcjhome}/bin + dodir ${gcjhome}/jre/bin + dosym ${gccbin}/gij ${gcjhome}/bin/java + dosym ${gccbin}/gij ${gcjhome}/jre/bin/java + dosym ${gccbin}/gjar ${gcjhome}/bin/jar + dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc + dosym ${gccbin}/grmic ${gcjhome}/bin/rmic + dosym ${gccbin}/gjavah ${gcjhome}/bin/javah + dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap + dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer + dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner + dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry + dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry + dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool + dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool + dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii + dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd + dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd + dosym ${gccbin}/grmid ${gcjhome}/bin/rmid + dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid + dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver + dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv + dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv + + dodir ${gcjhome}/jre/lib/${libarch}/client + dodir ${gcjhome}/jre/lib/${libarch}/server + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so + use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so + + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \ + ${gcjhome}/jre/lib/rt.jar + dodir ${gcjhome}/lib + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \ + ${gcjhome}/lib/tools.jar + dosym ${gcclib}/include ${gcjhome}/include + + local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" + exeinto ${gcjhome}/bin + cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#${gcjhome}/bin/java#" \ + -e "s#@ECJ_JAR@#${ecj_jar}#" \ + -e "s#@RT_JAR@#${gcjhome}/jre/lib/rt.jar#" \ + -e "s#@TOOLS_JAR@#${gcjhome}/lib/tools.jar#" \ + | newexe - javac + + set_java_env +} + +pkg_postinst() { + # Do not set as system VM (see below) + # java-vm-2_pkg_postinst + + ewarn "gcj does not currently provide all the 1.5 or 1.6 APIs." + ewarn "See http://fuseyism.com/japi/ibmjdk15-libgcj-${PV}.html"; + ewarn "and http://fuseyism.com/japi/icedtea6-libgcj-${PV}.html"; + ewarn "Check for existing bugs relating to missing APIs and file" + ewarn "new ones at http://gcc.gnu.org/bugzilla/"; + ewarn + ewarn "Due to this and limited manpower, we currently cannot support" + ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap" + ewarn "IcedTea without prior binary VM installation. To do that, execute:" + ewarn + ewarn "emerge -o icedtea && emerge icedtea" +}
