Changeset - 475bd1a361e8
[Not reviewed]
default
0 4 2
Nathan Brink (binki) - 16 years ago 2009-01-06 19:16:59
ohnobinki@ohnopublishing.net
bumped to dev-embedded/phidget-2.1.5.20090105, created new files/phidget21-crosscompile.patch for this version, updated logic in dev-embedded/phidget's ebuilds
logic was changed in the all of the ebuilds - they are all identical except for which patches are referenced. Fixed references to things like make=>emake and calling java stuff when the java use-flag was disabled. The new files/phidget21-crosscompile.patch (files/phidget21-2.1.5.20090105.patch) was needed because the context of the diff against the Makefile changed.
6 files changed with 105 insertions and 17 deletions:
0 comments (0 inline, 0 general)
dev-embedded/phidget/ChangeLog
Show inline comments
 
# ChangeLog for dev-embedded/phidget
 
# Copyright 1999-2008 Nathan Brink; Distributed under the GPL v2
 
# $Header: $
 

	
 
  06 Jan 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +phidget-2.1.5.20090105.ebuild, +files/phidget21-2.1.5.20090105-crosscompile.patch, phidget-2.1.4.20080924.ebuild, phidget-2.1.5.20081023.ebuild
 
	Bumped to new version - needed to create a new files/phidget-crosscompile.patch for this version because the Makefile changed. 
 
	Updated logic in the all of the ebuilds - they are all identical except for which patches are referenced. Fixed references to things like make=>emake and calling java stuff when the java use-flag was disabled
 
	
 
  01 Dec 2008; Cron Daemon for Nathan Phillip Brink
 
  <ohnobinki@ohnopublishing.net> ChangeLog:
 
  Automatically bumped to phidget-2.1.5.20081023.ebuild from
 
  phidget-2.1.4.20080924.ebuild
 

	
 
*phidget-2.1.4.20080924 (17 November 2008)
 

	
 
  17 Nov 2008; Nathan Phillip Brink <ohnobinki@ohnopublishing.net> +phidget-2.1.4.20080924.ebuild, +Manifest, +files/phidget21-crosscompile.patch, +file/phidget21-java.patch, +file/phidget21-libdir.patch :
 
  Initial import.  Ebuild submitted by Nathan Phillip Brink <ohnobinki@ohnopublishing.net>.
 
  Initial import.  Ebuild submitted by Nathan Phillip Brink <ohnobinki@ohnopublishing.net> (me?).
dev-embedded/phidget/Manifest
Show inline comments
 
AUX phidget21-2.1.5.20090105-crosscompile.patch 777 RMD160 03f57998134858f836199eae68de8548e403c41d SHA1 0306406dfe52098c9147a18d98643424cd72bfaa SHA256 9f7a89a6a47a9e53cb281d667d74fca60f33b98d61e04d37e1b652590cd47a6a
 
AUX phidget21-crosscompile.patch 709 RMD160 28c7fc6f7f9b4717ca85c81afa317a156d01b3f4 SHA1 e12db1b12b4357304141264e4fb6128d9de92172 SHA256 e8c4cd0e591da58ee47f1bf7fe7026b2ecbe7bae90fdb7c6681d780341ec6089
 
AUX phidget21-java.patch 785 RMD160 956f5913c5ca75e120de97796d2e6ac07b5f85be SHA1 4c44ef073ef75c70cd2b05892e0161930df0c21d SHA256 045ea70c94fe3a3f0e3b92b295ae643a20ee7e378cae1258ee1d14a7c2f8cb2f
 
AUX phidget21-libdir.patch 562 RMD160 b4d98da1326708f13ec19a938c64e829431b975a SHA1 bbc770a37506753ce1c8cd5256c337db6ed64ac1 SHA256 12d90ad6ea8d4ca2faa0d533e321847241620d4cc4d624e816c4e69a22e6c726
 
DIST Phidgetlinux_2.1.4.20080924.tar.gz 292176 RMD160 2360bc2ccc14d2afd30de11386eac3f4e3399cf0 SHA1 a296abee3f48d8126b521b10e487cd77fe07051d SHA256 7f60fc29147b45bbe0fa6cca769bf8a940839b13b8786bdfbca18bb54822cb25
 
DIST Phidgetlinux_2.1.5.20081023.tar.gz 304986 RMD160 08819880bbf364cbf388c826f2dd8b4c3dba5933 SHA1 3f1e0ad9b610968ee0539093be76ff539cc66210 SHA256 a03c0c46fa2901cc536492933da30711f522cb9776fd15b3e556f3cba2cdd709
 
EBUILD phidget-2.1.4.20080924.ebuild 1263 RMD160 4536aa3b392577048a20648948ec59378e39a4a1 SHA1 4452773b19938aabeb2b31d1557dbd66df13aac4 SHA256 8752907dc9ebccc2d19313e0197dac948ee6f050f33e7e27f0c4128ee1af8fb1
 
EBUILD phidget-2.1.5.20081023.ebuild 1263 RMD160 4536aa3b392577048a20648948ec59378e39a4a1 SHA1 4452773b19938aabeb2b31d1557dbd66df13aac4 SHA256 8752907dc9ebccc2d19313e0197dac948ee6f050f33e7e27f0c4128ee1af8fb1
 
MISC ChangeLog 648 RMD160 3a0a6c197565ef0b6bf349d2f41b015f0f864c63 SHA1 5acedaa3921c79e031e0671b1cc4a2cf5a6f6be2 SHA256 fe63dc25faa2898b98314f51b5d1114e47fcef281f21d34ead0f0a1f1dda21eb
 
MISC ChangeLog~ 3666 RMD160 66cb4dd33af7e01d9cddb6d426cf6a23e4ed4cd5 SHA1 69f1df908689e7aa10662bec32bbec9a9f50a2d1 SHA256 3106e6ce482f8b35c9129cf09af41fb9634263ed1186dec32ef1bc8436f62b34
 
DIST Phidgetlinux_2.1.5.20090105.tar.gz 316490 RMD160 0c0088eee842b7b4b723867c08964557c665b9aa SHA1 484fa7c170e412e9513d5f08e883a5efd9a7c366 SHA256 bfaaaf2aa21c854b2f0305ed6b55605d336b6b890eedf40ead0e17b419b7ac33
 
EBUILD phidget-2.1.4.20080924.ebuild 1495 RMD160 173df7037bca960c446e5fd08ad0a45cb0332c48 SHA1 b4e598f1be661776579eba8ba95997739e8708b7 SHA256 36c044c109820e2691d2810ab3919511fd136962f47555103dd8dbd1f8a17641
 
EBUILD phidget-2.1.5.20081023.ebuild 1495 RMD160 173df7037bca960c446e5fd08ad0a45cb0332c48 SHA1 b4e598f1be661776579eba8ba95997739e8708b7 SHA256 36c044c109820e2691d2810ab3919511fd136962f47555103dd8dbd1f8a17641
 
EBUILD phidget-2.1.5.20090105.ebuild 1510 RMD160 d347879f0067ba41009eaa2bb8b2bde97b579143 SHA1 10e796823e08ede4be4b317f350581ad0f9e64a9 SHA256 c146f6dc411fbe90035dffd632d78087d466caf61bb0d26b4cd50b3053f7e809
 
MISC ChangeLog 1207 RMD160 bd42df7744f01c013804da153c2ddfc10e9afb08 SHA1 3c92e7166b1ec1e6394e2be53fa56687f121e68e SHA256 82893b9acdcdc20261bbad4c465b320773cd15e7d83a866a9fdf836a91f84e58
dev-embedded/phidget/files/phidget21-2.1.5.20090105-crosscompile.patch
Show inline comments
 
new file 100644
 
diff -u /var/tmp/portage/dev-embedded/phidget-2.1.5.20090105/work/Phidgetlinux/phidget21/Makefile /tmp/buffer-content-128429IH
 
--- /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
dev-embedded/phidget/phidget-2.1.4.20080924.ebuild
Show inline comments
 
@@ -30,19 +30,20 @@ src_unpack() {
 
}
 

	
 
src_compile() {
 
	echo cd "${S}"
 
	cd "${S}"
 
	if use java; then
 
		emake CROSS_COMPILE=${CHOST}- JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 
		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 
	else
 
		emake CROSS_COMPILE=${CHOST}- || die "emake failed"
 
		emake CROSS_COMPILE=${CHOST}- JAVA=n || die "emake failed"
 
	fi
 
}
 

	
 
src_install() {
 

	
 
	mkdir -p ${D}/usr/$(get_libdir)
 
	mkdir -p ${D}/usr/include
 
	make install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir)
 
	java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
 
	#it seems that phidget's install stuff wants these dirs to exist
 
	mkdir -p ${D}/usr/$(get_libdir) && \
 
		mkdir -p ${D}/usr/include || die "mkdir failed in creation of destination directories"
 
	emake install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir) || die "emake install failed"
 
	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
 
}
dev-embedded/phidget/phidget-2.1.5.20081023.ebuild
Show inline comments
 
@@ -30,19 +30,20 @@ src_unpack() {
 
}
 

	
 
src_compile() {
 
	echo cd "${S}"
 
	cd "${S}"
 
	if use java; then
 
		emake CROSS_COMPILE=${CHOST}- JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 
		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 
	else
 
		emake CROSS_COMPILE=${CHOST}- || die "emake failed"
 
		emake CROSS_COMPILE=${CHOST}- JAVA=n || die "emake failed"
 
	fi
 
}
 

	
 
src_install() {
 

	
 
	mkdir -p ${D}/usr/$(get_libdir)
 
	mkdir -p ${D}/usr/include
 
	make install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir)
 
	java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so
 
	#it seems that phidget's install stuff wants these dirs to exist
 
	mkdir -p ${D}/usr/$(get_libdir) && \
 
		mkdir -p ${D}/usr/include || die "mkdir failed in creation of destination directories"
 
	emake install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir) || die "emake install failed"
 
	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
 
}
dev-embedded/phidget/phidget-2.1.5.20090105.ebuild
Show inline comments
 
new file 100644
 
# Copyright 1999-2008 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: $
 

	
 
inherit versionator eutils java-pkg-opt-2
 

	
 
DESCRIPTION="Phidget USB hardware interface library"
 
MY_PV="$(get_major_version)$(get_version_component_range 2)"
 
LONGNAME="Phidgetlinux"
 
SRC_URI="http://www.phidgets.com/downloads/libraries/${LONGNAME}_${PV}.tar.gz"
 
HOMEPAGE="http://www.phidgets.com"
 

	
 
SLOT="0"
 

	
 
LICENSE="LGPL"
 
KEYWORDS="x86 ~alpha ~ppc ~sparc ~hppa ~amd64"
 

	
 
RDEPEND="java? ( >=virtual/jre-1.4 )"
 
DEPEND="java? ( >=virtual/jdk-1.4 )"
 

	
 
S=${WORKDIR}/${LONGNAME}/${PN}${MY_PV}
 

	
 
src_unpack() {
 
	unpack ${LONGNAME}_${PV}.tar.gz
 
	cd "${S}"
 

	
 
	epatch "${FILESDIR}"/${PN}${MY_PV}-libdir.patch
 
	epatch "${FILESDIR}"/${PN}${MY_PV}-2.1.5.20090105-crosscompile.patch
 
	use java && epatch "${FILESDIR}"/${PN}${MY_PV}-java.patch
 
}
 

	
 
src_compile() {
 
	echo cd "${S}"
 
	cd "${S}"
 
	if use java; then
 
		emake CROSS_COMPILE=${CHOST}- JAVA=y JAVAFLAGS="$(java-pkg_get-jni-cflags)" jni || die "emake failed"
 
	else
 
		emake CROSS_COMPILE=${CHOST}- JAVA=n || die "emake failed"
 
	fi
 
}
 

	
 
src_install() {
 

	
 
	#it seems that phidget's install stuff wants these dirs to exist
 
	mkdir -p ${D}/usr/$(get_libdir) && \
 
		mkdir -p ${D}/usr/include || die "mkdir failed in creation of destination directories"
 
	emake install INSTALLPREFIX=${D} PREFIX=usr LIBDIR=$(get_libdir) || die "emake install failed"
 
	use java && java-pkg_regso "${D}"/usr/$(get_libdir)/lib${PN}${MY_PV}.so || die "registering java .so file failed"
 
}
0 comments (0 inline, 0 general)