diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-10-23 19:28:58 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-10-23 19:28:58 +0000 |
commit | a6c4a87d8a6403bfe8b6895b18f0c943534cf541 (patch) | |
tree | 14773a895cb5da47b8fc4ee119ece4201056118f /dev-java/gcj-jdk | |
parent | Version bump. (diff) | |
download | gentoo-2-a6c4a87d8a6403bfe8b6895b18f0c943534cf541.tar.gz gentoo-2-a6c4a87d8a6403bfe8b6895b18f0c943534cf541.tar.bz2 gentoo-2-a6c4a87d8a6403bfe8b6895b18f0c943534cf541.zip |
Don't require corresponding gcc to be active. #439228
Backport various fixes to 4.5.4.
(Portage version: 2.1.11.27/cvs/Linux x86_64, signed Manifest commit with key 0xDA575EB7)
Diffstat (limited to 'dev-java/gcj-jdk')
-rw-r--r-- | dev-java/gcj-jdk/ChangeLog | 10 | ||||
-rw-r--r-- | dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild | 97 | ||||
-rw-r--r-- | dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild | 97 |
3 files changed, 203 insertions, 1 deletions
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog index 2be2898d8e15..379296b071ae 100644 --- a/dev-java/gcj-jdk/ChangeLog +++ b/dev-java/gcj-jdk/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/gcj-jdk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.8 2012/09/28 18:37:53 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.9 2012/10/23 19:28:58 sera Exp $ + +*gcj-jdk-4.6.3-r2 (23 Oct 2012) +*gcj-jdk-4.5.4 (23 Oct 2012) + + 23 Oct 2012; Ralph Sennhauser <sera@gentoo.org> +gcj-jdk-4.5.4.ebuild, + +gcj-jdk-4.6.3-r2.ebuild: + Don't require corresponding gcc to be active. #439228 + Backport various fixes to 4.5.4. *gcj-jdk-4.6.3-r1 (28 Sep 2012) diff --git a/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild new file mode 100644 index 000000000000..fdfcb5ee81ec --- /dev/null +++ b/dev-java/gcj-jdk/gcj-jdk-4.5.4.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2012 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.5.4.ebuild,v 1.1 2012/10/23 19:28:58 sera Exp $ + +EAPI="4" + +inherit java-vm-2 multilib + +DESCRIPTION="Java wrappers around GCJ" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" +SLOT="0" +IUSE="" + +ECJ_GCJ_SLOT="3.5" + +RDEPEND=" + ~sys-devel/gcc-${PV}[gcj,gtk] + 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 + 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} + + dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/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 APIs." + ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.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" +} diff --git a/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild new file mode 100644 index 000000000000..565e0a2c2810 --- /dev/null +++ b/dev-java/gcj-jdk/gcj-jdk-4.6.3-r2.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2012 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.6.3-r2.ebuild,v 1.1 2012/10/23 19:28:58 sera Exp $ + +EAPI="4" + +inherit java-vm-2 multilib + +DESCRIPTION="Java wrappers around GCJ" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux" +SLOT="0" +IUSE="" + +ECJ_GCJ_SLOT="3.6" + +RDEPEND=" + ~sys-devel/gcc-${PV}[gcj,gtk] + 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 + 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} + + dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/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 APIs." + ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.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" +} |