diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-09-01 14:39:19 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-09-01 14:39:19 +0000 |
| commit | 70772ba39eb32a4c2132101623c4f403b73c6c3b (patch) | |
| tree | d6839a3797d08f6753d488320794973373a4ad5b /dev-java | |
| parent | Do not pull in corefonts when USE=truetype; users who need the original coref... (diff) | |
| download | gentoo-2-70772ba39eb32a4c2132101623c4f403b73c6c3b.tar.gz gentoo-2-70772ba39eb32a4c2132101623c4f403b73c6c3b.tar.bz2 gentoo-2-70772ba39eb32a4c2132101623c4f403b73c6c3b.zip | |
Fixed for and marked *-macos
(Portage version: 2.2.01.22288-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jffi/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jffi/jffi-1.2.6.ebuild | 30 |
2 files changed, 31 insertions, 4 deletions
diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog index f181f47ac742..0e684bad5040 100644 --- a/dev-java/jffi/ChangeLog +++ b/dev-java/jffi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jffi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.27 2013/08/31 15:01:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.28 2013/09/01 14:39:19 grobian Exp $ + + 01 Sep 2013; Fabian Groffen <grobian@gentoo.org> jffi-1.2.6.ebuild: + Fixed for and marked *-macos 31 Aug 2013; Pacho Ramos <pacho@gentoo.org> jffi-1.0.11.ebuild: Drop -Werror usage in tests and fix tests building with gcc-4.7 (#438130) diff --git a/dev-java/jffi/jffi-1.2.6.ebuild b/dev-java/jffi/jffi-1.2.6.ebuild index f9b1d6a8471f..9c7c51f7b186 100644 --- a/dev-java/jffi/jffi-1.2.6.ebuild +++ b/dev-java/jffi/jffi-1.2.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.1 2013/02/07 13:15:36 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.2 2013/09/01 14:39:19 grobian Exp $ EAPI="5" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz" LICENSE="|| ( Apache-2.0 LGPL-3 )" SLOT="1.2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="" COMMON_DEP=" @@ -33,6 +33,26 @@ java_prepare() { cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die epatch "${FILESDIR}"/${P}_no-werror.patch + # misc fixes for Darwin + if [[ ${CHOST} == *-darwin* ]] ; then + local uarch + # don't do multiarch + # avoid using Xcode stuff + # use Prefix' headers + # don't mess with deployment target + # set install_name + use x64-macos && uarch=x86_64 + use x86-macos && uarch=i386 + use ppc-macos && uarch=ppc + sed -i \ + -e "/ARCHES +=/s/=.*$/= ${uarch}/" \ + -e "/XCODE=/s:=.*$:=${EPREFIX}:" \ + -e "/MACSDK/s/^/#/" \ + -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \ + -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \ + jni/GNUmakefile || die + fi + find "${WORKDIR}" -iname '*.jar' -delete } @@ -83,13 +103,17 @@ src_test() { } src_install() { + local libname=".so" + cat > boot.properties <<-EOF jffi.boot.library.path = ${JAVA_PKG_LIBDEST} EOF jar -uf target/${PN}.jar boot.properties || die + [[ ${CHOST} == *-darwin* ]] && libname=.jnilib + java-pkg_dojar target/${PN}.jar - java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so + java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname} use doc && java-pkg_dojavadoc target/site/apidocs use source && java-pkg_dosrc src/main/java/* |