# HG changeset patch # User Nathan Phillip Brink # Date 2010-03-30 19:53:20 # Node ID 2787cc77fd360e41924aee31a508430caf90b307 # Parent 655d0054a3c73e9cd5f9b4fc9083413f39c72a23 Remove old version and fix compilation with portage-multilib using toolchain-funcs.eclass. (Portage version: 2.2_rc67-r3/hg/Linux x86_64) (Signed Manifest commit) diff --git a/dev-embedded/phidget/ChangeLog b/dev-embedded/phidget/ChangeLog --- a/dev-embedded/phidget/ChangeLog +++ b/dev-embedded/phidget/ChangeLog @@ -1,7 +1,15 @@ # ChangeLog for dev-embedded/phidget -# Copyright 1999-2009 Nathan Brink; Distributed under the GPL v2 +# Copyright 1999-2010 Nathan Brink; Distributed under the GPL v2 # $Header: $ + 30 Mar 2010; Nathan Phillip Brink (ohnobinki) + -files/phidget21-crosscompile.patch, + -phidget-2.1.5.20090105.ebuild, +files/phidget21-gentoo.patch, + phidget-2.1.6.20090430.ebuild, -files/phidget21-java.patch, + -files/phidget21-libdir.patch: + Remove old version and fix compilation with portage-multilib using + toolchain-funcs.eclass. + 11 May 2009; Nathan Phillip Brink phidget-2.1.5.20090105.ebuild, phidget-2.1.6.20090430.ebuild: Added installation of a jar to facilitate use of JNI. diff --git a/dev-embedded/phidget/Manifest b/dev-embedded/phidget/Manifest --- a/dev-embedded/phidget/Manifest +++ b/dev-embedded/phidget/Manifest @@ -1,11 +1,16 @@ -AUX phidget21-crosscompile.patch 697 RMD160 74eb677dba2abe1706ebec408e708cf58207ae96 SHA1 8f0b9e5af45d46c441e9cddd4aa88bf541ce1d92 SHA256 af9411cb24c63e380ab1a7b9a033ffabc25461fe349ee115a9a2536b4e5777ad -AUX phidget21-java.patch 716 RMD160 7fd30e15aa9b89d7395c74cbf8b413f2aabff795 SHA1 8c541296b63e4e4e0a42d576af14517275aeceab SHA256 8274b80b18ba4a90e233088d6c963e0e2c31ae9a98022e1cff68be1e08673109 -AUX phidget21-libdir.patch 559 RMD160 133c0473c42003e00d90e2c60af5e94dd91d8b09 SHA1 fd5a67307f08a8ca1f9b751114d0bc3aff3daae5 SHA256 f17604ededb52a5dd1ef4e71c25d8ccb09bb5ecb15bee1b9c0cc38ce19e01072 -DIST Phidgetlinux_2.1.5.20090105.tar.gz 316490 RMD160 0c0088eee842b7b4b723867c08964557c665b9aa SHA1 484fa7c170e412e9513d5f08e883a5efd9a7c366 SHA256 bfaaaf2aa21c854b2f0305ed6b55605d336b6b890eedf40ead0e17b419b7ac33 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX phidget21-gentoo.patch 1152 RMD160 a66603d1eaa19f0046b1b60fc52f31fe8b49a02c SHA1 987ec42e4548a90514e3dd9c191864adb824a744 SHA256 a6de0d06ab9a0a1f776e5fa8da0475f4111774cec76e35c7725b0bfb05417ff2 DIST Phidgetlinux_2.1.6.20090430.tar.gz 342985 RMD160 a45e335c4672e918152537cd771bcd4b21a85ddf SHA1 60fadd7ba15342b2ad6c58b19d659532fe963513 SHA256 b1cf06ecae292c2b201c30878fa2e89c2251d8a0b994a9227870a7ce52dc2605 -DIST phidget21jar_2.1.5.20090105.zip 40775 RMD160 3c919b8b39163e2d4723ea7a9e50c1c974bdf349 SHA1 15a8bc192144fdbac2e69b3be26c8c7cc1a810bb SHA256 00289f31e8d4b94b8498e07e01feb54b2b896c15a0ee026d51d95eaf62b3c7be DIST phidget21jar_2.1.6.20090430.zip 40828 RMD160 beabfd38a7d10f64a8c2b5eeb1ecefbcaeef283f SHA1 7759eae57ed3d8c0b0529d2b21cc566e0bbfe93e SHA256 d9302fb72bb1f11d7473346c6ac30efcf1fe7ea8b89a05c0405b0e6c3880d134 -EBUILD phidget-2.1.5.20090105.ebuild 1807 RMD160 d1da86c4db44704a080f65d4ce7cbd4be47ec7f7 SHA1 927e46015eb9c1078f989d45daefb93e8c34d3c6 SHA256 d2834ed52b8ce0f593105efd97679e81b9cd136f6b0be89dcbc9381a8ceb68d8 -EBUILD phidget-2.1.6.20090430.ebuild 1807 RMD160 d1da86c4db44704a080f65d4ce7cbd4be47ec7f7 SHA1 927e46015eb9c1078f989d45daefb93e8c34d3c6 SHA256 d2834ed52b8ce0f593105efd97679e81b9cd136f6b0be89dcbc9381a8ceb68d8 -MISC ChangeLog 2856 RMD160 22aa2aaed311c94c66b841cf103032edc846262f SHA1 da0adf816b69fc7d83cb29cf7393d480ddd426ec SHA256 8ea5b5adf682620d2d22f24710927dc213198650fb96e3660925638d8e37704c +EBUILD phidget-2.1.6.20090430.ebuild 1612 RMD160 1c6d5d465063545cf552165d7be6a12240b83325 SHA1 379e0c184280839a412c1d4710ae0952d8aa2156 SHA256 7643ff3ca38cdc0e847b57b1a1cb6ab8cc46dcc65d329f5742313ef904fccb20 +MISC ChangeLog 3230 RMD160 0e60aaf9475dbf63a2f225dc976175f0ca72cdb2 SHA1 7729a0bb813e192870ae026a730e0d4162f65bce SHA256 f5ca44e18f4656c4e31140e165eb069821eca858026e7ae598bd8a9e023405e2 MISC metadata.xml 172 RMD160 ac9d8165526474ed01605b242677b133677d627e SHA1 379fab1397357de050c74be1cbbb2da37ee3fcdd SHA256 74bc726733e7fd45be5b7a40fe34b62f1502551d6ee5797e65fc75522ead5972 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAkuyjvAACgkQni8M22OVw8B6GACeN5RG3M1k4aAdbjBBH3R8OJ5i +pcsAoKDUxjPIlP+vNnUQ3XDTGbfylDow +=n8Ji +-----END PGP SIGNATURE----- diff --git a/dev-embedded/phidget/files/phidget21-crosscompile.patch b/dev-embedded/phidget/files/phidget21-crosscompile.patch deleted file mode 100644 --- a/dev-embedded/phidget/files/phidget21-crosscompile.patch +++ /dev/null @@ -1,32 +0,0 @@ -Allow cross-compilation uclibc/busybox-style. - ---- /Phidgetlinux/phidget21/Makefile 2009-01-06 17:20:07.000000000 -0500 -+++ /Phidgetlinux/phidget21/Makefile 2009-01-06 17:46:57.000000000 -0500 -@@ -2,18 +2,16 @@ - DEBUG?=n - DMALLOC?=n - JAVA?=y --CROSSCOMPILE?=n -+CROSS_COMPILE?= - ZEROCONF?=avahi - ZEROCONF_LOOKUP?=n - --ifeq ($(CROSSCOMPILE),y) --CC=arm-linux-gcc --NM=arm-linux-nm --AR=arm-linux-ar --CXX=arm-linux-g++ --CPP=arm-linux-cpp --LD=arm-linux-ld --endif -+CC=$(CROSS_COMPILE)gcc -+NM=$(CROSS_COMPILE)nm -+AR=$(CROSS_COMPILE)ar -+CXX=$(CROSS_COMPILE)g++ -+CPP=$(CROSS_COMPILE)cpp -+LD=$(CROSS_COMPILE)ld - - ifeq ($(JAVA),y) - JAVAHOME := /usr/java/j2sdk1.4.2_18 - -Diff finished. Tue Jan 6 17:46:57 2009 diff --git a/dev-embedded/phidget/files/phidget21-gentoo.patch b/dev-embedded/phidget/files/phidget21-gentoo.patch new file mode 100644 --- /dev/null +++ b/dev-embedded/phidget/files/phidget21-gentoo.patch @@ -0,0 +1,51 @@ +--- a/Makefile 2008-12-22 19:05:10.000000000 -0500 ++++ b/Makefile 2010-03-30 19:33:08.000000000 -0400 +@@ -1,26 +1,22 @@ + PREFIX=/usr + DEBUG?=n + DMALLOC?=n +-JAVA?=y +-CROSSCOMPILE?=n ++#JAVA?=y ++CROSS_COMPILE?= ++JAVAFLAGS?= + ZEROCONF?=avahi + ZEROCONF_LOOKUP?=n + +-ifeq ($(CROSSCOMPILE),y) +-CC=arm-linux-gcc +-NM=arm-linux-nm +-AR=arm-linux-ar +-CXX=arm-linux-g++ +-CPP=arm-linux-cpp +-LD=arm-linux-ld +-endif +- +-ifeq ($(JAVA),y) +-JAVAHOME := /usr/java/j2sdk1.4.2_18 +-JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux +-else +-JAVAFLAGS= +-endif ++CC=$(CROSS_COMPILE)gcc ++AR=$(CROSS_COMPILE)ar ++CXX=$(CROSS_COMPILE)g++ ++ ++#ifeq ($(JAVA),y) ++#JAVAHOME := /usr/java/j2sdk1.4.2_18 ++#JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux ++#else ++#JAVAFLAGS= ++#endif + + ifeq ($(DMALLOC),y) + DEBUGFLAGS=-DDMALLOC -DDMALLOC_FUNC_CHECK +@@ -157,7 +153,7 @@ + cd Java ; jar cf ../$@ com/phidgets/event/*.class com/phidgets/*.class + + install: all +- $(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/lib ++ $(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/$(LIBDIR) + $(INSTALL_FILE) phidget21.h $(INSTALLPREFIX)/$(PREFIX)/include + + uninstall: diff --git a/dev-embedded/phidget/files/phidget21-java.patch b/dev-embedded/phidget/files/phidget21-java.patch deleted file mode 100644 --- a/dev-embedded/phidget/files/phidget21-java.patch +++ /dev/null @@ -1,36 +0,0 @@ -Allows the ebuild to specify java variables - ---- Makefile Tue Sep 30 07:24:27 2008 -+++ Makefile Tue Sep 30 07:28:44 2008 -@@ -1,8 +1,9 @@ - PREFIX=/usr - DEBUG?=n - DMALLOC?=n --JAVA?=y -+#JAVA?=y - CROSS_COMPILE?= -+JAVAFLAGS?= - ZEROCONF?=avahi - - #ifeq ($(CROSSCOMPILE),y) -@@ -14,12 +16,12 @@ - LD=$(CROSS_COMPILE)ld - #endif - --ifeq ($(JAVA),y) --JAVAHOME := /usr/java/j2sdk1.4.2_18 --JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux --else --JAVAFLAGS= --endif -+#ifeq ($(JAVA),y) -+#JAVAHOME := /usr/java/j2sdk1.4.2_18 -+#JAVAFLAGS=-I$(JAVAHOME)/include -I$(JAVAHOME)/include/linux -+#else -+#JAVAFLAGS= -+#endif - - ifeq ($(DMALLOC),y) - DEBUGFLAGS=-DDMALLOC -DDMALLOC_FUNC_CHECK - -Diff finished. Tue Sep 30 07:28:44 2008 diff --git a/dev-embedded/phidget/files/phidget21-libdir.patch b/dev-embedded/phidget/files/phidget21-libdir.patch deleted file mode 100644 --- a/dev-embedded/phidget/files/phidget21-libdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allows support for me (I seem to be the only Gentoo amd64 user without a symlink from /usr/lib to /usr/lib64) - ---- Makefile Mon Sep 22 14:48:19 2008 -+++ -content-3770fbg Tue Sep 30 09:27:29 2008 -@@ -150,7 +150,7 @@ - cd Java ; jar cf ../$@ com/phidgets/event/*.class com/phidgets/*.class - - install: all -- $(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/lib -+ $(INSTALL_LIB) libphidget21.so $(INSTALLPREFIX)/$(PREFIX)/$(LIBDIR) - $(INSTALL_FILE) phidget21.h $(INSTALLPREFIX)/$(PREFIX)/include - - uninstall: - -Diff finished. Tue Sep 30 09:27:29 2008 diff --git a/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild b/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild deleted file mode 100644 --- a/dev-embedded/phidget/phidget-2.1.5.20090105.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -#base must be last to get base_src_prepare() -inherit versionator multilib java-pkg-opt-2 base - -MY_PV="$(get_major_version)$(get_version_component_range 2)" -MY_PN="Phidgetlinux" - -DESCRIPTION="Phidget USB hardware interface library" -HOMEPAGE="http://www.phidgets.com" -SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz -http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="java" - -DEPEND="java? ( >=virtual/jdk-1.4 )" -RDEPEND="java? ( >=virtual/jre-1.4 )" - -S=${WORKDIR}/${MY_PN}/${PN}${MY_PV} - -PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-libdir.patch \ - "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch \ - "${FILESDIR}"/${PN}${MY_PV}-java.patch ) - -src_compile() { - local javaflags usejava maketarget - if use java; then - javaflags="$(java-pkg_get-jni-cflags)" - usejava=y - maketarget=jni - else - javaflags= - usejava=n - maketarget=all - fi - - emake CROSS_COMPILE=${CHOST}- JAVA="${usejava}" JAVAFLAGS="${javaflags}" "${maketarget}" || die "emake failed" -} - -src_install() { - - #phidget's Makefile's install target requires that these dirs exist - dodir /usr/$(get_libdir) && \ - dodir /usr/include || die "mkdir failed to create installation target directories" - - local usejava - use java && usejava=y || usejava=n - emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \ - || die "emake install failed" - - if use java; then - java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so - java-pkg_dojar "${WORKDIR}/phidget${MY_PV}.jar" - fi - - dodoc ../README udev/99-phidgets.rules || die - docinto examples - dodoc examples/* || die "failed to install examples" -} diff --git a/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild b/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild --- a/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild +++ b/dev-embedded/phidget/phidget-2.1.6.20090430.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="2" #base must be last to get base_src_prepare() -inherit versionator multilib java-pkg-opt-2 base +inherit java-pkg-opt-2 multilib toolchain-funcs versionator base MY_PV="$(get_major_version)$(get_version_component_range 2)" MY_PN="Phidgetlinux" @@ -13,21 +13,20 @@ MY_PN="Phidgetlinux" DESCRIPTION="Phidget USB hardware interface library" HOMEPAGE="http://www.phidgets.com" SRC_URI="http://www.phidgets.com/downloads/libraries/${MY_PN}_${PV}.tar.gz -http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip" + java? ( http://www.phidgets.com/downloads/libraries/phidget${MY_PV}jar_${PV}.zip )" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="java" -DEPEND="java? ( >=virtual/jdk-1.4 )" -RDEPEND="java? ( >=virtual/jre-1.4 )" +DEPEND="java? ( virtual/jdk + app-arch/unzip )" +RDEPEND="java? ( virtual/jre )" S=${WORKDIR}/${MY_PN}/${PN}${MY_PV} -PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-libdir.patch \ - "${FILESDIR}"/${PN}${MY_PV}-crosscompile.patch \ - "${FILESDIR}"/${PN}${MY_PV}-java.patch ) +PATCHES=( "${FILESDIR}"/${PN}${MY_PV}-gentoo.patch ) src_compile() { local javaflags usejava maketarget @@ -41,19 +40,16 @@ src_compile() { maketarget=all fi - emake CROSS_COMPILE=${CHOST}- JAVA="${usejava}" JAVAFLAGS="${javaflags}" "${maketarget}" || die "emake failed" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" JAVA="${usejava}" JAVAFLAGS="${javaflags}" ${maketarget} || die } src_install() { - #phidget's Makefile's install target requires that these dirs exist - dodir /usr/$(get_libdir) && \ - dodir /usr/include || die "mkdir failed to create installation target directories" + dodir /usr/{$(get_libdir),include} || die local usejava use java && usejava=y || usejava=n - emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} \ - || die "emake install failed" + emake install INSTALLPREFIX="${D}" PREFIX=usr LIBDIR=$(get_libdir) JAVA=${usejava} || die if use java; then java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so @@ -62,5 +58,5 @@ src_install() { dodoc ../README udev/99-phidgets.rules || die docinto examples - dodoc examples/* || die "failed to install examples" + dodoc examples/* || die }