Patchwork [meta-oe,master] libgphoto2: refix build

login
mail settings
Submitter Andreas Müller
Date Nov. 30, 2012, 6:04 p.m.
Message ID <1354298653-494-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/39993/
State Accepted
Commit 2da6650639c1f6a9bd994d3cbc40f6b5c3bfff41
Headers show

Comments

Andreas Müller - Nov. 30, 2012, 6:04 p.m.
this manually reverts

commit 92e3f684d14fd287194e78bc5e65f80504758b7d
Author: Koen Kooi <koen@dominion.thruhere.net>
Date:   Wed Nov 21 14:42:02 2012 +0000

    gphoto2: fix gettext build error

which should go into danny only [1].

[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042668.html

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-graphics/gphoto2/libgphoto2_2.4.11.bb  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
index 27f660b..60271cc 100644
--- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
+++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb
@@ -3,7 +3,7 @@  SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1"
 
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "libtool jpeg virtual/libusb0 libexif"
 
@@ -26,6 +26,7 @@  inherit autotools pkgconfig gettext lib_package
 EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes"
 
 do_configure_append() {
+	cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/
 	cd ${S}/libgphoto2_port/
 	autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
 	cd ${S}