diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2006-12-08 01:44:25 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2006-12-08 01:44:25 +0000 |
| commit | c03d6cd4c7dd42175ea3eb0e1ff8a90f4abb7670 (patch) | |
| tree | 6dee000b7983c501fde47bd1654412a65eeb9126 /dev-java/libreadline-java | |
| parent | Add ~x86-fbsd keyword as per bug #156587, thanks to Mark Kowarsky. (diff) | |
| download | gentoo-2-c03d6cd4c7dd42175ea3eb0e1ff8a90f4abb7670.tar.gz gentoo-2-c03d6cd4c7dd42175ea3eb0e1ff8a90f4abb7670.tar.bz2 gentoo-2-c03d6cd4c7dd42175ea3eb0e1ff8a90f4abb7670.zip | |
Fix building on fbsd thanks to Diego Pettenò <flameeyes@gentoo.org>, bugs #157390 and #157387.
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'dev-java/libreadline-java')
| -rw-r--r-- | dev-java/libreadline-java/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch | 21 | ||||
| -rw-r--r-- | dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild | 10 |
3 files changed, 36 insertions, 3 deletions
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog index 5e333edd0bd1..5a66f639a9ef 100644 --- a/dev-java/libreadline-java/ChangeLog +++ b/dev-java/libreadline-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/libreadline-java # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.22 2006/10/05 18:04:17 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.23 2006/12/08 01:44:25 caster Exp $ + + 08 Dec 2006; Vlastimil Babka <caster@gentoo.org> + +files/libreadline-java-0.8.0-gmake.patch, + libreadline-java-0.8.0-r2.ebuild: + Fix building on fbsd thanks to Diego Pettenò <flameeyes@gentoo.org>, bugs + #157390 and #157387. 05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> libreadline-java-0.8.0-r1.ebuild, libreadline-java-0.8.0-r2.ebuild: diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch new file mode 100644 index 000000000000..6de5cde18e89 --- /dev/null +++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch @@ -0,0 +1,21 @@ +Index: libreadline-java-0.8.0/src/native/Makefile +=================================================================== +--- libreadline-java-0.8.0.orig/src/native/Makefile ++++ libreadline-java-0.8.0/src/native/Makefile +@@ -69,13 +69,13 @@ all: $(T_LIBS) + lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT) + + JavaReadline: +- make TG=$@ lib ++ $(MAKE) TG=$@ lib + + JavaEditline: +- make TG=$@ lib ++ $(MAKE) TG=$@ lib + + JavaGetline: +- make TG=$@ lib ++ $(MAKE) TG=$@ lib + + $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS) + ifeq (MSC,$(WIN32)) diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild index 42e4c5b96ec2..b8faca6b61e4 100644 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild +++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild,v 1.3 2006/10/05 18:04:17 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild,v 1.4 2006/12/08 01:44:25 caster Exp $ inherit java-pkg-2 eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -IUSE="doc source" +IUSE="doc source elibc_FreeBSD" COMMON_DEP="sys-libs/ncurses" RDEPEND=">=virtual/jre-1.4 @@ -25,8 +25,14 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/termcap-to-ncurses.patch + # bug #157387, reported upstream + epatch "${FILESDIR}/${P}-gmake.patch" + # bug #157390 sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die + if use elibc_FreeBSD; then + sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed" + fi } src_compile() { |