diff options
| -rw-r--r-- | dev-java/jffi/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-java/jffi/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/jffi/files/0.3-makefile-flags.patch | 30 | ||||
| -rw-r--r-- | dev-java/jffi/files/0.4.1-makefile-flags.patch | 30 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-0.3-r3.ebuild | 63 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-0.4.1-r1.ebuild | 63 |
6 files changed, 202 insertions, 2 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index 43e3010cfbed..969b35c51749 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.2 2009/05/27 10:57:08 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.3 2009/06/03 19:58:15 caster Exp $ + +*jffi-0.4.1-r1 (03 Jun 2009) +*jffi-0.3-r3 (03 Jun 2009) + + 03 Jun 2009; Vlastimil Babka <caster@gentoo.org> + +files/0.3-makefile-flags.patch, +jffi-0.3-r3.ebuild, + +files/0.4.1-makefile-flags.patch, +jffi-0.4.1-r1.ebuild: + Revbump that tries to fix flags problems reported in bug #271533. Use + virtual/libffi instead of gcc[libffi] as requested in bug #272058. Fix not + workin VM selection, bug #272373. *jffi-0.4.1 (27 May 2009) diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index 016f6d54048a..7334cd647b50 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -1,6 +1,10 @@ +AUX 0.3-makefile-flags.patch 1081 RMD160 8882e26ed7d63ffe960e4a1b58c756fbade234c9 SHA1 67b95d1e1d87f429a70a59b416a52663b6ccb647 SHA256 1ad484484c226704c5d4f70c027fe2124cb63ec9721ab09ab239080b5b027840 +AUX 0.4.1-makefile-flags.patch 1004 RMD160 3e0494367fab8c4f05dfa51d3627c256bda7801d SHA1 8cdb06a1940372ea9c2d07a97bc7647f83872d15 SHA256 da66a889fa0500c1242a40cf7568b61943171d60586498cd16026081a89530bd DIST jffi-0.3.tar.bz2 1399294 RMD160 0bf761dae280e1201a971799cc1d1813657d05b7 SHA1 dafbbe968c9be0bc4fcb94618779d67cc1e65389 SHA256 5d3ee453e632824e09c102cf6d56f839de36b85a7882b7426f9f25e8c2d176c4 DIST jffi-0.4.1.tar.bz2 1555550 RMD160 a4b516416784b61fd8543c907a5f60b199a59d57 SHA1 40c5bb0a35a93b9faef6c30bbbe3eb68845b4632 SHA256 9051fdfcd8e95e6205d189103f6dc357683cb8c9bbbab564f94fa8d99f7a80af EBUILD jffi-0.3-r2.ebuild 1774 RMD160 8ea9f89e98078f627ff48aa89971befa98ce762d SHA1 0f978fcc6a606250fe5de86d48a739fb4b5ee660 SHA256 cf389ffafa937b9f1bc6c594e2f19f32cd9e76c142d7d5bcc748092e55fc6fb5 +EBUILD jffi-0.3-r3.ebuild 1773 RMD160 908bf12f413e805fa92888f5d260bebe8b173b18 SHA1 12c0fa7c9c5f0dae06f569d6a5c79d93bcd8b21b SHA256 669f26feba32b249637636d6ba7945cd05597ba3c54c25a9cb167aea9f4f8772 +EBUILD jffi-0.4.1-r1.ebuild 1777 RMD160 86304a4ecc381c93ce69f3637d5851f235495495 SHA1 0579de8e7652ef059f4ae7bbd554806eef145f82 SHA256 12f7c09953d81efff5041b938e00736377abca31be7ac0185681d4330370f9af EBUILD jffi-0.4.1.ebuild 1777 RMD160 9eb068974e140f13d2671a059979a4924698142a SHA1 f61ec15b61cb49045c2daeb7adeeb6161877d10a SHA256 4c5c3a7aa1b94aed59aec37991f9d8a351d49c8c97e86da4d30e3df1f1e43599 -MISC ChangeLog 535 RMD160 62c3587798adff8b91122352787255523c3b74bc SHA1 98b29ac7aba5d4a40b2651c5c34f87e111372dab SHA256 0091f4186b0f194fe619dde0108af70a603e0decee8cf2b0bcee6449cfd4f37c +MISC ChangeLog 943 RMD160 788445ae66195f69f53f6eb147282c757b4273b5 SHA1 59cb53c23ec13e80466835abb0872582dada8809 SHA256 da02facf311572f8748ae332cdfee887d29d2d2a51d3779e9847c7336827edcd MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b diff --git a/dev-java/jffi/files/0.3-makefile-flags.patch b/dev-java/jffi/files/0.3-makefile-flags.patch new file mode 100644 index 000000000000..780e4c5e62cf --- /dev/null +++ b/dev-java/jffi/files/0.3-makefile-flags.patch @@ -0,0 +1,30 @@ +--- jni/GNUmakefile.orig 2009-06-03 21:32:31.000000000 +0200 ++++ jni/GNUmakefile 2009-06-03 21:34:56.000000000 +0200 +@@ -43,7 +43,7 @@ + # http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG + OFLAGS = -O2 $(JFLAGS) +-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses ++WFLAGS = -Wall -Wno-unused -Wno-parentheses + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically + LDFLAGS += $(SOFLAGS) +@@ -55,7 +55,7 @@ + + JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" + IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include" +-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) ++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) + CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE + + ifeq ($(OS),mingw32) +@@ -65,9 +65,6 @@ + ifneq ($(OS),$(BUILD_OS)) + CC ?= i386-mingw32-gcc + LD ?= i386-mingw32-ld +- else +- CC = gcc +- LD = ld + endif + endif + ifneq ($(findstring cygwin,$(BUILD_OS)),) diff --git a/dev-java/jffi/files/0.4.1-makefile-flags.patch b/dev-java/jffi/files/0.4.1-makefile-flags.patch new file mode 100644 index 000000000000..11694b26eccc --- /dev/null +++ b/dev-java/jffi/files/0.4.1-makefile-flags.patch @@ -0,0 +1,30 @@ +--- jni/GNUmakefile.orig 2009-06-03 21:52:34.000000000 +0200 ++++ jni/GNUmakefile 2009-06-03 21:51:50.000000000 +0200 +@@ -42,7 +42,7 @@ + + # MacOS headers aren't completely warning free, so turn them off + ifneq (($OS),darwin) +- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef ++ WFLAGS = -Wall -Wno-unused -Wno-parentheses -Wundef + endif + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically +@@ -54,7 +54,7 @@ + + JDK_INCLUDES= -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" + IFLAGS = -I"$(BUILD_DIR)" -I"$(JFFI_SRC_DIR)" -I"$(LIBFFI_BUILD_DIR)/include" +-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) ++CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) + CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE + + ifeq ($(OS),mingw32) +@@ -64,9 +64,6 @@ + ifneq ($(OS),$(BUILD_OS)) + CC ?= i386-mingw32-gcc + LD ?= i386-mingw32-ld +- else +- CC = gcc +- LD = ld + endif + endif + ifneq ($(findstring cygwin,$(BUILD_OS)),) diff --git a/dev-java/jffi/jffi-0.3-r3.ebuild b/dev-java/jffi/jffi-0.3-r3.ebuild new file mode 100644 index 000000000000..df0058c76542 --- /dev/null +++ b/dev-java/jffi/jffi-0.3-r3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.3-r3.ebuild,v 1.1 2009/06/03 19:58:15 caster Exp $ + +# Probably best to leave the CFLAGS as they are here. See... +# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + +EAPI="2" +JAVA_PKG_IUSE="source test" +inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic + +DESCRIPTION="An optimized Java interface to libffi" +HOMEPAGE="http://kenai.com/projects/jffi" +SRC_URI="mirror://gentoo//${P}.tar.bz2" +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.5 + virtual/libffi" + +DEPEND=">=virtual/jdk-1.5 + virtual/libffi + test? ( dev-java/ant-junit4 )" + +JAVA_PKG_BSFIX_NAME="build-impl.xml" + +java_prepare() { + # Delete the bundled JARs. + find lib -name "*.jar" -delete || die + # Delete the bundled libffi + rm -rf jni/libffi || die + + # bug #271533 and #272058 + epatch "${FILESDIR}/${PV}-makefile-flags.patch" + + # bug #272058 + append-cflags $(pkg-config --cflags-only-I libffi) + + # any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ? + local arch="${ARCH}" + use x86 && arch="i386" + + # Fetch our own prebuilt libffi. + mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die + + ln -snf "/usr/$(get_libdir)/libffi.so" \ + "build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die + + # Don't include prebuilt files for other archs. + sed -i '/<zipfileset src="archive\//d' custom-build.xml || die +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + use source && java-pkg_dosrc src/* +} + +src_test() { + ANT_TASKS="ant-junit4" eant test \ + -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" +} diff --git a/dev-java/jffi/jffi-0.4.1-r1.ebuild b/dev-java/jffi/jffi-0.4.1-r1.ebuild new file mode 100644 index 000000000000..125e32c48617 --- /dev/null +++ b/dev-java/jffi/jffi-0.4.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-0.4.1-r1.ebuild,v 1.1 2009/06/03 19:58:15 caster Exp $ + +# Probably best to leave the CFLAGS as they are here. See... +# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html + +EAPI="2" +JAVA_PKG_IUSE="source test" +inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic + +DESCRIPTION="An optimized Java interface to libffi" +HOMEPAGE="http://kenai.com/projects/jffi" +SRC_URI="mirror://gentoo//${P}.tar.bz2" +LICENSE="LGPL-3" +SLOT="0.4" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.5 + virtual/libffi" + +DEPEND=">=virtual/jdk-1.5 + virtual/libffi + test? ( dev-java/ant-junit4 )" + +JAVA_PKG_BSFIX_NAME="build-impl.xml" + +java_prepare() { + # Delete the bundled JARs. + find lib -name "*.jar" -delete || die + # Delete the bundled libffi + rm -rf jni/libffi || die + + # bug #271533 and #272058 + epatch "${FILESDIR}/${PV}-makefile-flags.patch" + + # bug #272058 + append-cflags $(pkg-config --cflags-only-I libffi) + + # any better function for this, excluding get_system_arch in java-vm-2 which is incorrect to inherit ? + local arch="${ARCH}" + use x86 && arch="i386" + + # Fetch our own prebuilt libffi. + mkdir -p "build/jni/libffi-${arch}-linux/.libs" || die + + ln -snf "/usr/$(get_libdir)/libffi.so" \ + "build/jni/libffi-${arch}-linux/.libs/libffi_convenience.a" || die + + # Don't include prebuilt files for other archs. + sed -i '/<zipfileset src="archive\//d' custom-build.xml || die +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + use source && java-pkg_dosrc src/* +} + +src_test() { + ANT_TASKS="ant-junit4" eant test \ + -Dlibs.junit_4.classpath="$(java-pkg_getjars --with-dependencies junit-4)" +} |