[oe-commits] Dmitry Baryshkov : gphoto2: correct popt selection madness
GIT User account
git at amethyst.openembedded.net
Thu Dec 4 14:00:39 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8701797386b5b05d85edb553c798d19de1287bdf
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8701797386b5b05d85edb553c798d19de1287bdf
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Thu Dec 4 01:56:43 2008 +0300
gphoto2: correct popt selection madness
test for gphoto failed on my system, as is ended always trying to link
popt from /usr/lib64.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
---
packages/gphoto2/files/gphoto-popt-fixup.patch | 22 ++++++++++++++++++++++
packages/gphoto2/gphoto2_2.4.2.bb | 5 +++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/packages/gphoto2/files/gphoto-popt-fixup.patch b/packages/gphoto2/files/gphoto-popt-fixup.patch
new file mode 100644
index 0000000..66b6168
--- /dev/null
+++ b/packages/gphoto2/files/gphoto-popt-fixup.patch
@@ -0,0 +1,22 @@
+Index: gphoto2-2.4.2/m4m/gp-check-popt.m4
+===================================================================
+--- gphoto2-2.4.2.orig/m4m/gp-check-popt.m4 2008-12-04 01:46:40.000000000 +0300
++++ gphoto2-2.4.2/m4m/gp-check-popt.m4 2008-12-04 01:47:03.000000000 +0300
+@@ -69,7 +69,7 @@
+ if test -n "${popt_prefix}"; then
+ :
+ elif test -d "${popt_prefix}/include"; then
+- CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS}"
++ CPPFLAGS="-I${popt_prefix}/include ${CPPFLAGS_save}"
+ else
+ continue
+ fi
+@@ -113,7 +113,7 @@
+ if test "${popt_libdir}" = "/"; then
+ popt_libdir=""
+ elif test -d "${popt_libdir}"; then
+- LDFLAGS="-L${popt_libdir} ${LDFLAGS}"
++ LDFLAGS="-L${popt_libdir} ${LDFLAGS_save}"
+ else
+ continue
+ fi
diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb
index 996edb2..ee4e9c6 100644
--- a/packages/gphoto2/gphoto2_2.4.2.bb
+++ b/packages/gphoto2/gphoto2_2.4.2.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital
SECTION = "console/utils"
LICENSE = "GPL"
DEPENDS = "libtool libgphoto2 popt"
-PR = "r0"
+PR = "r1"
-SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2\
+ file://gphoto-popt-fixup.patch;patch=1"
inherit autotools
More information about the Openembedded-commits
mailing list