Attachment #312105 for bug #416373

View | Details | Raw Unified | Return to bug 416373
Collapse All | Expand All




# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.1 2012/05/06 17:41:31 sera Exp $

EAPI=4

inherit java-pkg-2 toolchain-funcs prefix

MY_PN="ecj"
DMF="R-${PV}-201006080911"

src_install() {
	java-pkg_dojar ${MY_PN}.jar
	dobin "${FILESDIR}/${PN}-${SLOT}"
	eprefixify "${ED}/usr/bin/${PN}-${SLOT}"
	use native && dolib.so ${MY_PS}.so
}

pkg_postinst() {
	if use native; then
		$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
			"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
			"${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
	fi

	einfo "To select between slots of ECJ..."

Lines 1-7 Link Here

(-)ecj-gcj.old/files/ecj-gcj-3.6 (-2 / +2 lines)
1	#!/bin/bash	1	#!/bin/bash
2	# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular	2	# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular
3	# so we fallback to gcc-config discovery	3	# so we fallback to gcc-config discovery
4	GIJ_BIN="/usr/bin/gij"	4	GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij"
5	if [[ ! -f ${GIJ_BIN} ]]; then	5	if [[ ! -f ${GIJ_BIN} ]]; then
6	GIJ_BIN="$(gcc-config -B)/gij"	6	GIJ_BIN="$(gcc-config -B)/gij"
7	fi	7	fi
Lines 13-19 fi Link Here
13		13
14	# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter	14	# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter
15	# this breaks e.g. bootstrap of ant-core	15	# this breaks e.g. bootstrap of ant-core
16	ecj_cp="/usr/share/ecj-gcj-3.6/lib/ecj.jar"	16	ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-3.6/lib/ecj.jar"
17	if [[ -n "${CLASSPATH}" ]]; then	17	if [[ -n "${CLASSPATH}" ]]; then
18	ecj_cp="${ecj_cp}:${CLASSPATH}"	18	ecj_cp="${ecj_cp}:${CLASSPATH}"
19	fi	19	fi

Return to bug 416373

Lines 1-10 Link Here

(-)ecj-gcj.old/ecj-gcj-3.6.ebuild (-4 / +5 lines)
1	# Copyright 1999-2012 Gentoo Foundation	1	# Copyright 1999-2012 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.1 2012/05/06 17:41:31 sera Exp $	3	# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.1 2012/05/06 17:41:31 sera Exp $
4		4
5	EAPI=2	5	EAPI=4
6		6
7	inherit java-pkg-2 toolchain-funcs	7	inherit java-pkg-2 toolchain-funcs prefix
8		8
9	MY_PN="ecj"	9	MY_PN="ecj"
10	DMF="R-${PV}-201006080911"	10	DMF="R-${PV}-201006080911"
Lines 88-101 src_compile() { Link Here
88	src_install() {	88	src_install() {
89	java-pkg_dojar ${MY_PN}.jar	89	java-pkg_dojar ${MY_PN}.jar
90	dobin "${FILESDIR}/${PN}-${SLOT}"	90	dobin "${FILESDIR}/${PN}-${SLOT}"
		91	eprefixify "${ED}/usr/bin/${PN}-${SLOT}"
91	use native && dolib.so ${MY_PS}.so	92	use native && dolib.so ${MY_PS}.so
92	}	93	}
93		94
94	pkg_postinst() {	95	pkg_postinst() {
95	if use native; then	96	if use native; then
96	$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \	97	$(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \
97	/usr/share/${PN}-${SLOT}/lib/ecj.jar \	98	"${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \
98	/usr/$(get_libdir)/${MY_PN}-${SLOT}.so	99	"${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so
99	fi	100	fi
100		101
101	einfo "To select between slots of ECJ..."	102	einfo "To select between slots of ECJ..."