[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andrew John Hughes" <gnu_andrew@member.fsf.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/
Date: Wed, 18 Mar 2015 15:31:59 +0000 (UTC)	[thread overview]
Message-ID: <1426692707.269c6df8c55f1624a601205b2976c2a188f3e77c.gnu_andrew@gentoo> (raw)

commit:     269c6df8c55f1624a601205b2976c2a188f3e77c
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Mar 18 15:31:47 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Mar 18 15:31:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=269c6df8

Support GCC 4.9.2.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/gcj-jdk/ChangeLog            |   8 ++-
 dev-java/gcj-jdk/Manifest             |  19 ++----
 dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild | 105 ++++++++++++++++++++++++++++++++++
 3 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index f604418..aaafcb5 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*gcj-jdk-4.9.2 (18 Mar 2015)
+
+  18 Mar 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +gcj-jdk-4.9.2.ebuild:
+  Support GCC 4.9.2.
+
 *gcj-jdk-4.9.1 (28 Aug 2014)
 
   28 Aug 2014; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 3b649cf..4beae08 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -8,22 +8,13 @@ EBUILD gcj-jdk-4.7.3-r2.ebuild 3718 SHA256 a5513ece7a1efd99845b4252b234304fb7137
 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
 EBUILD gcj-jdk-4.9.1.ebuild 3743 SHA256 3ede4e6fc641365759801c839f16fc641d5a68c05cea992cc8eb7ca335a79117 SHA512 403908b42964add0391bfb21e831c3659e22ed95fb060bd01e06d928e563fd1f12370b4edcfd9ed4d783176bb125766fadd4f08ca317af86a74f6bb57e23c4aa WHIRLPOOL c8cfba07354688702ff418668782525490b8a8773a071e8127a526b6d91801e0ca3341d4cbd77760538ddf8f52993e7049ce6f57aac10299c23604879fcafe88
-MISC ChangeLog 10699 SHA256 5fcd36ff8280256661c8f6f862073e9e5ea27bea18d35100a4f8ca26d8591a70 SHA512 f0a0c01dfb9306fe47858c81fddc0eaa6059f08ec90aea18cbfd6005d65e85782468cc787260634fd59fa81cedf5d93857c6e0c90c10de45d13fb5b9c19748f2 WHIRLPOOL b47b8a6d20cde5de0a0768dc70fc44e60f4ad344e95e66030f1bf4430f195cbd5aaf40abf8d477f61d1d1dfd9abe16ef09c2ddb74b6f0a6b97c2da8186645aec
+EBUILD gcj-jdk-4.9.2.ebuild 3743 SHA256 40ee19687c3c76971b78f964875ee1899bef7e34c8ca949a1507f4ed0c53ca3f SHA512 7f0ed8a57f1d2dfc0e4a9658b4b84675484b22a8070fba90a14b94e177231120dbf25a5c7138ce77eeaa68506ad22ac2681f9dae459e3f172cf1859dc3a07afc WHIRLPOOL ff26f01e0ad45883e51d10154f5febc19be068ffdb93d44f85e37ef132c7499d0801485c1ff708e8f5c63061444284ab9c76c3f07fe36a4f0d3b850c92715cae
+MISC ChangeLog 10838 SHA256 eb1f68195d9241af1413e19c7d21a6853f3179f220f78c7947d2815a3fb87b74 SHA512 75a85d4a768e194c784d4773ce81f2253cf0c5f4d77e15613f9b8f9f1af54f1a61df3170c40d2576bafb7b15e19b02008835c88cdda7c8f9c6125ec2eb4a006c WHIRLPOOL 433e1593edbe22c32744eed7f8746044a55071ed518e51cfd7f2c2b3adc20f4eaa11261a9078f7b60b0857782c495a4621f8d6dfbd49fdca20ada85e65313572
 MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iF4EARYIAAYFAlUJmlwACgkQz9oPmzWWQiJK5gEAelLpI3ClvkZ32n4WcMZ4xvxC
+sRm7KEZcufdtiz0fZX4BAODJMMQT3PUQ8YL0NbGv4rPBwfjnZ39ZfRpCzTe8CX0I
+=OM5e
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
new file mode 100644
index 0000000..3fa0e80
--- /dev/null
+++ b/dev-java/gcj-jdk/gcj-jdk-4.9.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 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"
+}

next             reply	other threads:[~2015-03-18 15:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-18 15:31 Andrew John Hughes [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-19 22:14 [gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/ James Le Cuirot
2015-06-23  4:11 Andrew John Hughes
2014-09-02  4:30 Andrew John Hughes
2014-09-02  4:30 Andrew John Hughes
2014-08-07 18:41 ` Andrew John Hughes
2013-12-26 19:12 Andrew John Hughes
2013-12-26 19:12 Andrew John Hughes
2013-09-04 23:28 Andrew John Hughes
2013-09-02 21:49 Andrew John Hughes

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f604418 dfblob:aaafcb5 dfblob:3b649cf dfblob:4beae08
dfblob:3fa0e80 )
 OR (
bs:"[gentoo-commits] proj/java:master commit in: dev-java/gcj-jdk/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426692707.269c6df8c55f1624a601205b2976c2a188f3e77c.gnu_andrew@gentoo \
    --to=gnu_andrew@member.fsf.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox