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

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

[Koen Kooi]

Signed-off-by: Koen Kooi <koen@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}
-- 
1.7.7.6

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

[Andreas Müller]

On Wed, Nov 21, 2012 at 3:42 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Signed-off-by: Koen Kooi <koen@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}
> --
> 1.7.7.6
>
Could you please add an error log?

Andreas

Re: [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@.  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.

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

[Andreas Müller]

On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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@
>
> 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.
>
I tested this patch and get

ERROR: Function failed: do_install (see
/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
for further information)
ERROR: Logfile of failure stored in:
/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
Log data follows:
| DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common',
'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi',
'common']
| DEBUG: Executing shell function do_install
| NOTE: make -j20
DESTDIR=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/image
install
| Making install in libgphoto2_port
| make[1]: Entering directory
`/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port'
| Making install in po
| make[2]: Entering directory
`/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port/po'
| /bin/sh @MKINSTALLDIRS@
/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/image/usr/share
| /bin/sh: @MKINSTALLDIRS@: No such file or directory
| make[2]: *** [install-data-yes] Error 127
| make[2]: Leaving directory
`/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port/po'
| make[1]: *** [install-recursive] Error 1
| make[1]: Leaving directory
`/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port'
| make: *** [install-recursive] Error 1
| ERROR: oe_runmake failed
| ERROR: Function failed: do_install (see
/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
for further information)
ERROR: Task 2 (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.4.11.bb,
do_install) failed with exit code '1'

Andreas

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

[Peter Bigot]

On Sun, Nov 25, 2012 at 11:46 AM, Andreas Müller <
schnitzeltony@googlemail.com> wrote:

> On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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.infrom
> > 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.
> >
> I tested this patch and get
>
> ERROR: Function failed: do_install (see
>
> /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
> for further information)
> ERROR: Logfile of failure stored in:
>
> /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
> Log data follows:
> | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common',
> 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi',
> 'common']
> | DEBUG: Executing shell function do_install
> | NOTE: make -j20
>
> DESTDIR=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/image
> install
> | Making install in libgphoto2_port
> | make[1]: Entering directory
>
> `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port'
> | Making install in po
> | make[2]: Entering directory
>
> `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port/po'
> | /bin/sh @MKINSTALLDIRS@
>
> /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/image/usr/share
> | /bin/sh: @MKINSTALLDIRS@: No such file or directory
> | make[2]: *** [install-data-yes] Error 127
> | make[2]: Leaving directory
>
> `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port/po'
> | make[1]: *** [install-recursive] Error 1
> | make[1]: Leaving directory
>
> `/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/libgphoto2-2.4.11/libgphoto2_port'
> | make: *** [install-recursive] Error 1
> | ERROR: oe_runmake failed
> | ERROR: Function failed: do_install (see
>
> /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2/2.4.11-r4/temp/log.do_install.6873
> for further information)
> ERROR: Task 2
> (/home/Superandy/data/oe-core/sources/meta-openembedded/meta-oe/recipes-graphics/gphoto2/
> libgphoto2_2.4.11.bb,
> do_install) failed with exit code '1'
>
> Andreas
>

This makes some sense to me.  The proposed patch removes the unconditional
overwrite of po/Makefile.in.in, but left the removal of AC_PO_SUBDIRS().
It looks like your builds have something that causes autotools.bbclass to
rebuild the po directories (which I assume is why you needed the original
patch).  That doesn't happen in my build; I completely reverted your
original patch, because I didn't have any problems with the r2 version of
the recipe.

Dunno how to reconcile this.  Maybe figure out why autotools.bbclass
overwrites the top-level po/Makefile.in.in in your environment and making
the recipe extension do so only under the same conditions.

Peter

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

[Andreas Müller]

On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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?

Andreas

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

[Peter Bigot]

On Fri, Nov 30, 2012 at 10:35 AM, Andreas Müller <
schnitzeltony@googlemail.com> wrote:

> On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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.infrom
> > 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

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

[Andreas Müller]

On Fri, Nov 30, 2012 at 5:51 PM, Peter Bigot <bigotp@acm.org> wrote:
> On Fri, Nov 30, 2012 at 10:35 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>>
>> On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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

Andreas

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

[Peter Bigot]

On Fri, Nov 30, 2012 at 11:17 AM, Andreas Müller <
schnitzeltony@googlemail.com> wrote:

> On Fri, Nov 30, 2012 at 5:51 PM, Peter Bigot <bigotp@acm.org> wrote:
> > On Fri, Nov 30, 2012 at 10:35 AM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> >>
> >> On Sun, Nov 25, 2012 at 3:19 PM, Peter Bigot <bigotp@acm.org> 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

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

[Andreas Müller]

On Fri, Nov 30, 2012 at 6:17 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
>> 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
>
> Andreas
Peter

One stupid question: Are you working with oe-core master - because

commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date:   Thu Oct 11 08:43:01 2012 +0000

which started my gphoto2 trouble is not found in danny

Andreas

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

[Andreas Müller]

On Fri, Nov 30, 2012 at 6:45 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Fri, Nov 30, 2012 at 6:17 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>>> 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
>>
>> Andreas
> Peter
>
> One stupid question: Are you working with oe-core master - because
>
> commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
> Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> Date:   Thu Oct 11 08:43:01 2012 +0000
>
> which started my gphoto2 trouble is not found in danny
>
> Andreas
So from what I can see now is that meta-oe's

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

    gphoto2: fix gettext build error

    Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

should be merged to danny and reverted (with PRbump) in master.

Andreas

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

[Peter Bigot]

On Fri, Nov 30, 2012 at 11:50 AM, Andreas Müller <
schnitzeltony@googlemail.com> wrote:

> On Fri, Nov 30, 2012 at 6:45 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Fri, Nov 30, 2012 at 6:17 PM, Andreas Müller
> > <schnitzeltony@googlemail.com> wrote:
> >>> 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
> >>
> >> Andreas
> > Peter
> >
> > One stupid question: Are you working with oe-core master - because
> >
> > commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
> > Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Date:   Thu Oct 11 08:43:01 2012 +0000
> >
> > which started my gphoto2 trouble is not found in danny
>

Yes, seems to be a danny/master inconsistency, resulting from oe-core
branching danny six weeks before meta-openembedded did, with my checkouts
happening between the two points.

So from what I can see now is that meta-oe's
>
> commit 92e3f684d14fd287194e78bc5e65f80504758b7d
> Author: Koen Kooi <koen@dominion.thruhere.net>
> Date:   Wed Nov 21 14:42:02 2012 +0000
>
>     gphoto2: fix gettext build error
>
>     Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>
> should be merged to danny and reverted (with PRbump) in master.
>

I think 5febf70 should be reverted (with PR bump) in danny, which is where
I'd started before I noticed 92e3f68 in patchwork.  In any case 92e3f68
should be discarded since it leaves the removal of AM_PO_SUBDIRS() from
configure.ac in place with no motivation once the Makefile.in.in is no
longer overwritten.

If that seems plausible I'll prepare a patch.

Peter

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

[Andreas Müller]

On Fri, Nov 30, 2012 at 7:22 PM, Peter Bigot <bigotp@acm.org> wrote:
> On Fri, Nov 30, 2012 at 11:50 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>>
>> On Fri, Nov 30, 2012 at 6:45 PM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>> > On Fri, Nov 30, 2012 at 6:17 PM, Andreas Müller
>> > <schnitzeltony@googlemail.com> wrote:
>> >>> 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
>> >>
>> >> Andreas
>> > Peter
>> >
>> > One stupid question: Are you working with oe-core master - because
>> >
>> > commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
>> > Author: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > Date:   Thu Oct 11 08:43:01 2012 +0000
>> >
>> > which started my gphoto2 trouble is not found in danny
>
>
> Yes, seems to be a danny/master inconsistency, resulting from oe-core
> branching danny six weeks before meta-openembedded did, with my checkouts
> happening between the two points.
>
>> So from what I can see now is that meta-oe's
>>
>> commit 92e3f684d14fd287194e78bc5e65f80504758b7d
>> Author: Koen Kooi <koen@dominion.thruhere.net>
>> Date:   Wed Nov 21 14:42:02 2012 +0000
>>
>>     gphoto2: fix gettext build error
>>
>>     Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>
>> should be merged to danny and reverted (with PRbump) in master.
>
>
> I think 5febf70 should be reverted (with PR bump) in danny, which is where
> I'd started before I noticed 92e3f68 in patchwork.
agreed

> In any case 92e3f68 should be discarded since it leaves the removal of AM_PO_SUBDIRS() from
> configure.ac in place with no motivation once the Makefile.in.in is no
> longer overwritten.
Isn't that exactly what the patch I sent does?
>
> If that seems plausible I'll prepare a patch.
Appreciated - because if would do it would most likely cause further
confusion :)

Andreas

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

[Peter A. Bigot]

On 11/30/2012 12:38 PM, Andreas Müller wrote:
> On Fri, Nov 30, 2012 at 7:22 PM, Peter Bigot <bigotp@acm.org> wrote:
>> On Fri, Nov 30, 2012 at 11:50 AM, Andreas Müller
>> <schnitzeltony@googlemail.com> wrote:
>>> On Fri, Nov 30, 2012 at 6:45 PM, Andreas Müller
>>> <schnitzeltony@googlemail.com> wrote:
>>>> On Fri, Nov 30, 2012 at 6:17 PM, Andreas Müller
>>>> <schnitzeltony@googlemail.com> wrote:
>>>>>> 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
>>>>>
>>>>> Andreas
>>>> Peter
>>>>
>>>> One stupid question: Are you working with oe-core master - because
>>>>
>>>> commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
>>>> Author: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>> Date:   Thu Oct 11 08:43:01 2012 +0000
>>>>
>>>> which started my gphoto2 trouble is not found in danny
>>
>> Yes, seems to be a danny/master inconsistency, resulting from oe-core
>> branching danny six weeks before meta-openembedded did, with my checkouts
>> happening between the two points.
>>
>>> So from what I can see now is that meta-oe's
>>>
>>> commit 92e3f684d14fd287194e78bc5e65f80504758b7d
>>> Author: Koen Kooi <koen@dominion.thruhere.net>
>>> Date:   Wed Nov 21 14:42:02 2012 +0000
>>>
>>>      gphoto2: fix gettext build error
>>>
>>>      Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>>>
>>> should be merged to danny and reverted (with PRbump) in master.
>>
>> I think 5febf70 should be reverted (with PR bump) in danny, which is where
>> I'd started before I noticed 92e3f68 in patchwork.
> agreed
>
>> In any case 92e3f68 should be discarded since it leaves the removal of AM_PO_SUBDIRS() from
>> configure.ac in place with no motivation once the Makefile.in.in is no
>> longer overwritten.
> Isn't that exactly what the patch I sent does?

Probably.  Unfortunately I had put my subscription on hold six months 
ago and had problems re-enabling it last weekend so I missed seeing your 
patch; that's been fixed and my address updated.  I also hadn't bothered 
to pull recently, so didn't see that Koen's change had been applied.  
And so I added to the confusion; sorry about that.

>
>> If that seems plausible I'll prepare a patch.
> Appreciated - because if would do it would most likely cause further
> confusion :)
>
Actually, it'd probably lessen it, since I'm just a bit player in this 
theatre.  But I'll give it a go later this afternoon after I make 
progress on what I'm supposed to be working on....

Peter