[PATCH 0/3] A few miscellaneous fixes

[PATCH 0/3] A few miscellaneous fixes

[Christopher Larson]

The following changes since commit cc626b9e1671670a931ea3e528ea4b0f7b2e923b:

  webkit-gtk: Enable dependency tracking since the webkit makefiles have bugs (2011-10-05 14:36:18 +0100)

are available in the git repository at:
  http://github.com/kergoth/oe-core misc-fixes

Christopher Larson (3):
  autotools: fix multi-word arguments for EXTRA_OECONF
  autoconf: no need to hardcode the full path to m4
  oe.patch: drop bb.msg.domain reference

 meta/classes/autotools.bbclass                  |   14 ++++++--------
 meta/lib/oe/patch.py                            |    4 ++--
 meta/recipes-devtools/autoconf/autoconf_2.68.bb |    4 +++-
 3 files changed, 11 insertions(+), 11 deletions(-)

-- 
1.7.4.1

[PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF

[Christopher Larson]

This is needed to better support things like the following (with a
multi-word BUILD_CC):

    EXTRA_OECONF += '"ac_cv_prog_CC_FOR_BUILD=${BUILD_CC}"'

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/classes/autotools.bbclass |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index a4ce851..135be33 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -70,14 +70,12 @@ CONFIGUREOPT_DEPTRACK = "--disable-dependency-tracking"
 
 
 oe_runconf () {
-	if [ -x ${S}/configure ] ; then
-		cfgcmd="${S}/configure \
-		${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
-		bbnote "Running $cfgcmd..."
-		$cfgcmd || bbfatal "oe_runconf failed" 
-	else
-		bbfatal "no configure script found"
-	fi
+       if [ -x ${S}/configure ] ; then
+	       bbnote "Running ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
+	       ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" || bbfatal "oe_runconf failed"
+       else
+	       bbfatal "no configure script found"
+       fi
 }
 
 autotools_do_configure() {
-- 
1.7.4.1

Re: [PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF

[Koen Kooi]

Op 7 okt 2011, om 23:02 heeft Christopher Larson het volgende  
geschreven:

> This is needed to better support things like the following (with a
> multi-word BUILD_CC):
>
>    EXTRA_OECONF += '"ac_cv_prog_CC_FOR_BUILD=${BUILD_CC}"'
>
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> ---
> meta/classes/autotools.bbclass |   14 ++++++--------
> 1 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/meta/classes/autotools.bbclass b/meta/classes/ 
> autotools.bbclass
> index a4ce851..135be33 100644
> --- a/meta/classes/autotools.bbclass
> +++ b/meta/classes/autotools.bbclass
> @@ -70,14 +70,12 @@ CONFIGUREOPT_DEPTRACK = "--disable-dependency- 
> tracking"
>
>
> oe_runconf () {
> -	if [ -x ${S}/configure ] ; then
> -		cfgcmd="${S}/configure \
> -		${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
> -		bbnote "Running $cfgcmd..."
> -		$cfgcmd || bbfatal "oe_runconf failed"
> -	else
> -		bbfatal "no configure script found"
> -	fi
> +       if [ -x ${S}/configure ] ; then
> +	       bbnote "Running ${S}/configure ${CONFIGUREOPTS} $ 
> {EXTRA_OECONF} $@"
> +	       ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" ||  
> bbfatal "oe_runconf failed"
> +       else
> +	       bbfatal "no configure script found"
> +       f

Was the tab->spaces conversion intentional?

Re: [PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF

[Chris Larson]

On Fri, Oct 7, 2011 at 3:34 PM, Koen Kooi <koen@beagleboard.org> wrote:
>>
>> oe_runconf () {
>> -       if [ -x ${S}/configure ] ; then
>> -               cfgcmd="${S}/configure \
>> -               ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
>> -               bbnote "Running $cfgcmd..."
>> -               $cfgcmd || bbfatal "oe_runconf failed"
>> -       else
>> -               bbfatal "no configure script found"
>> -       fi
>> +       if [ -x ${S}/configure ] ; then
>> +              bbnote "Running ${S}/configure ${CONFIGUREOPTS}
>> ${EXTRA_OECONF} $@"
>> +              ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" ||
>> bbfatal "oe_runconf failed"
>> +       else
>> +              bbfatal "no configure script found"
>> +       f
>
> Was the tab->spaces conversion intentional?

Erm, nope, well spotted, thanks.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[PATCH 2/3] autoconf: no need to hardcode the full path to m4

[Christopher Larson]

This way autom4te uses m4 as it finds it in the PATH, rather than
hardcoding any particular path.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/recipes-devtools/autoconf/autoconf_2.68.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index c6209a3..21b5fb3 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
 require autoconf.inc
 
-PR = "r2"
+PR = "r3"
 
 PARALLEL_MAKE = ""
 
@@ -27,4 +27,6 @@ RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
 
 SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
 
+EXTRA_OECONF += "ac_cv_path_M4=m4"
+
 BBCLASSEXTEND = "native"
-- 
1.7.4.1

[PATCH 3/3] oe.patch: drop bb.msg.domain reference

[Christopher Larson]

Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 meta/lib/oe/patch.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 1406e19..9b0ff37 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -376,8 +376,8 @@ class UserResolver(Resolver):
             os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
             rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
             if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
-                bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
-                    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
+                bb.fatal(("Cannot proceed with manual patch resolution - '%s' not found. "
+                          + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
 
             # Construct a new PatchSet after the user's changes, compare the
             # sets, checking patches for modifications, and doing a remote
-- 
1.7.4.1

Re: [PATCH 3/3] oe.patch: drop bb.msg.domain reference

[Samuel Stirtzel]

Hi,
there was already a patch for this [1] (Yes I know, I should have
added more descriptions), according to the patch from Richard [2] the
message domain can be constructed dynamical now.
Since your patch seems a little bit different (dropping the message
domain completely) I can't tell if my resolution was inadequate.

For this patch I think it wouldn't make a big difference for the user,
feel free to apply the one that best suits in resolving the problem.


[1] http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009474.html
[2] http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

2011/10/7 Christopher Larson <kergoth@gmail.com>:
> Signed-off-by: Christopher Larson <kergoth@gmail.com>
> ---
>  meta/lib/oe/patch.py |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
> index 1406e19..9b0ff37 100644
> --- a/meta/lib/oe/patch.py
> +++ b/meta/lib/oe/patch.py
> @@ -376,8 +376,8 @@ class UserResolver(Resolver):
>             os.environ['SHELLCMDS'] = "bash --rcfile " + rcfile
>             rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
>             if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
> -                bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \
> -                    + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
> +                bb.fatal(("Cannot proceed with manual patch resolution - '%s' not found. "
> +                          + "Check TERMCMDRUN variable.") % bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
>
>             # Construct a new PatchSet after the user's changes, compare the
>             # sets, checking patches for modifications, and doing a remote
> --
> 1.7.4.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



-- 
Regards
Samuel

Re: [PATCH 3/3] oe.patch: drop bb.msg.domain reference

[Chris Larson]

On Mon, Oct 10, 2011 at 12:17 AM, Samuel Stirtzel
<s.stirtzel@googlemail.com> wrote:
> Hi,
> there was already a patch for this [1] (Yes I know, I should have
> added more descriptions), according to the patch from Richard [2] the
> message domain can be constructed dynamical now.
> Since your patch seems a little bit different (dropping the message
> domain completely) I can't tell if my resolution was inadequate.
>
> For this patch I think it wouldn't make a big difference for the user,
> feel free to apply the one that best suits in resolving the problem.
>
>
> [1] http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009474.html
> [2] http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=a6c48298b17e6a5844b3638b422fe226e3b67b89

Indeed, your version is superior.

For what it's worth, consider both of those patches of yours acked by
me. Getting useful error messages rather than python syntax errors is
rather important.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics