| 1 |
grobian 13/09/01 14:39:19 |
| 2 |
|
| 3 |
Modified: jffi-1.2.6.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fixed for and marked *-macos |
| 6 |
|
| 7 |
(Portage version: 2.2.01.22288-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-java/jffi/jffi-1.2.6.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: jffi-1.2.6.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- jffi-1.2.6.ebuild 7 Feb 2013 13:15:36 -0000 1.1 |
| 23 |
+++ jffi-1.2.6.ebuild 1 Sep 2013 14:39:19 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.1 2013/02/07 13:15:36 sera Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.6.ebuild,v 1.2 2013/09/01 14:39:19 grobian Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -14,7 +14,7 @@ |
| 33 |
|
| 34 |
LICENSE="|| ( Apache-2.0 LGPL-3 )" |
| 35 |
SLOT="1.2" |
| 36 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 37 |
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos" |
| 38 |
IUSE="" |
| 39 |
|
| 40 |
COMMON_DEP=" |
| 41 |
@@ -33,6 +33,26 @@ |
| 42 |
cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die |
| 43 |
epatch "${FILESDIR}"/${P}_no-werror.patch |
| 44 |
|
| 45 |
+ # misc fixes for Darwin |
| 46 |
+ if [[ ${CHOST} == *-darwin* ]] ; then |
| 47 |
+ local uarch |
| 48 |
+ # don't do multiarch |
| 49 |
+ # avoid using Xcode stuff |
| 50 |
+ # use Prefix' headers |
| 51 |
+ # don't mess with deployment target |
| 52 |
+ # set install_name |
| 53 |
+ use x64-macos && uarch=x86_64 |
| 54 |
+ use x86-macos && uarch=i386 |
| 55 |
+ use ppc-macos && uarch=ppc |
| 56 |
+ sed -i \ |
| 57 |
+ -e "/ARCHES +=/s/=.*$/= ${uarch}/" \ |
| 58 |
+ -e "/XCODE=/s:=.*$:=${EPREFIX}:" \ |
| 59 |
+ -e "/MACSDK/s/^/#/" \ |
| 60 |
+ -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \ |
| 61 |
+ -e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \ |
| 62 |
+ jni/GNUmakefile || die |
| 63 |
+ fi |
| 64 |
+ |
| 65 |
find "${WORKDIR}" -iname '*.jar' -delete |
| 66 |
} |
| 67 |
|
| 68 |
@@ -83,13 +103,17 @@ |
| 69 |
} |
| 70 |
|
| 71 |
src_install() { |
| 72 |
+ local libname=".so" |
| 73 |
+ |
| 74 |
cat > boot.properties <<-EOF |
| 75 |
jffi.boot.library.path = ${JAVA_PKG_LIBDEST} |
| 76 |
EOF |
| 77 |
jar -uf target/${PN}.jar boot.properties || die |
| 78 |
|
| 79 |
+ [[ ${CHOST} == *-darwin* ]] && libname=.jnilib |
| 80 |
+ |
| 81 |
java-pkg_dojar target/${PN}.jar |
| 82 |
- java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so |
| 83 |
+ java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname} |
| 84 |
|
| 85 |
use doc && java-pkg_dojavadoc target/site/apidocs |
| 86 |
use source && java-pkg_dosrc src/main/java/* |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.28 dev-java/jffi/ChangeLog |
| 91 |
|
| 92 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/ChangeLog?rev=1.28&view=markup |
| 93 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/ChangeLog?rev=1.28&content-type=text/plain |
| 94 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/ChangeLog?r1=1.27&r2=1.28 |
| 95 |
|
| 96 |
Index: ChangeLog |
| 97 |
=================================================================== |
| 98 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v |
| 99 |
retrieving revision 1.27 |
| 100 |
retrieving revision 1.28 |
| 101 |
diff -u -r1.27 -r1.28 |
| 102 |
--- ChangeLog 31 Aug 2013 15:01:48 -0000 1.27 |
| 103 |
+++ ChangeLog 1 Sep 2013 14:39:19 -0000 1.28 |
| 104 |
@@ -1,6 +1,9 @@ |
| 105 |
# ChangeLog for dev-java/jffi |
| 106 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 107 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.27 2013/08/31 15:01:48 pacho Exp $ |
| 108 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.28 2013/09/01 14:39:19 grobian Exp $ |
| 109 |
+ |
| 110 |
+ 01 Sep 2013; Fabian Groffen <grobian@g.o> jffi-1.2.6.ebuild: |
| 111 |
+ Fixed for and marked *-macos |
| 112 |
|
| 113 |
31 Aug 2013; Pacho Ramos <pacho@g.o> jffi-1.0.11.ebuild: |
| 114 |
Drop -Werror usage in tests and fix tests building with gcc-4.7 (#438130) |
Archives