On Fri, Nov 30, 2012 at 11:17 AM, Andreas Müller < [email protected]> wrote:
> On Fri, Nov 30, 2012 at 5:51 PM, Peter Bigot <[email protected]> wrote: > > On Fri, Nov 30, 2012 at 10:35 AM, Andreas Müller > > <[email protected]> wrote: > >> > >> On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <[email protected]> wrote: > >> > Koen Kooi <koen <at> dominion.thruhere.net> writes: > >> > > >> >> > >> >> Signed-off-by: Koen Kooi <koen <at> dominion.thruhere.net> > >> > > >> >> --- > >> >> .../recipes-graphics/gphoto2/libgphoto2_2.4.11.bb | 3 +-- > >> >> 1 files changed, 1 insertions(+), 2 deletions(-) > >> >> > >> >> 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 d7f6ac0..27f660b 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 = "r3" > >> >> +PR = "r4" > >> >> > >> >> DEPENDS = "libtool jpeg virtual/libusb0 libexif" > >> >> > >> >> @@ -26,7 +26,6 @@ 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} > >> > > >> > I was about to submit a similar patch reverting the original. Here's > >> > what I > >> > wrote up. > >> > > >> > Revert "libgphoto2: fix build" > >> > > >> > When using gettext-0.18's Makefile.in.in the elimination of > >> > AM_PO_SUBDIRS() > >> > prevented the substitution of @GETTEXT_MACRO_VERSION@. With the > >> > original > >> > patch I get: > >> > > >> > | Making all in po > >> > | make[4]: Entering directory > >> > > >> > > `/prj/oe/yocto-ang/build/tmp-angstrom_v2012_12-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r3/libgphoto2-2.4.11/libgphoto2_port/po' > >> > | *** error: gettext infrastructure mismatch: using a Makefile.in.in > >> > from > >> > gettext version 0.18 but the autoconf macros are from gettext version > >> > @GETTEXT_MACRO_VERSION@ > >> > > >> After last update it is again me to fail :-(( > >> > >> One question: Is it possible that you don't have gettext installed on > >> your build machine? If installed: Which version is it? > > > > > > gettext 0.18.1 is installed both on the build machine, and as a native > > package used when building under bitbake. If it's at all relevant, I > have > > LANG=en_US.UTF-8 in the environment in which bitbake is executed. > > > > Did you try a full reversion of 5febf70? Can you tell why, in your > > environment, autotools.bbclass replaces the Makefile.in.in for > libgphoto2? > > It does not do this for me (otherwise I think Koen's patch that only > reverts > > part of 5febf70 would not work). > > > > Peter > > > It should copy see autotools.bbclass line 195 > I can't find a version of autotools.bbclass that has the overwrite on line 195, but the command that does this in my version (from danny) is conditional on many things including the absence of a Makefile.in.in in the po directory. libgphoto2-2.24.11 has one there already, so the copy does not occur and nothing gets rebuilt. Peter _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
