[oe] [meta-oe][PATCH] gphoto2: fix gettext build error

[Peter Bigot]

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 at .  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@

autotools.bbclass does not unconditionally copy po/Makefile.in.in over the
original gettext-0.14 version.  Presumably the original patch could be fixed
by replicating the logic in autotools.bbclass that determines whether this
should be done.  Reverting it is a simpler solution that works in my
environment.

This reverts commit 5febf70d37c7e9cf55fa7de5285531a810312e3a.