[PATCH v2 0/5] add autotools nativesdk to meta-toolchain

[PATCH v2 0/5] add autotools nativesdk to meta-toolchain

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

v2 updates:
1) Extend m4 recipe with 'BBCLASSEXTEND="nativesdk"' instead of add
new *-nativesdk.bb files;

2) Add more comments to the commit messages.

[yocto #1603]

Add automake-nativesdk and autoconf-nativesdk into meta-toolchain to
help users process any new libtool m4 macros in their projects, such
as fix the configure issue:
    WARNING: unrecognized options: --with-libtool-sysroot

Also add m4-nativesdk and gnu-config-nativesdk which required by
autoconf-nativesdk.

The following changes since commit cf02474bda67f4f1043b2e95e1b371b2354585a7:
  Richard Purdie (1):
        qt-mobility: Add missing patch

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib wenzong/1603
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/1603

Wenzong Fan (5):
  gnu-config: Extend to provide nativesdk recipe
  m4: Extend to provide nativesdk recipe
  automake: Extend to provide nativesdk recipe
  autoconf: Extend to provide nativesdk recipe
  task-sdk-host-nativesdk: add autotools nativesdk to meta-toolchain

 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb |    4 +++-
 meta/recipes-devtools/autoconf/autoconf_2.68.bb    |    9 ++++++---
 meta/recipes-devtools/automake/automake.inc        |    2 +-
 meta/recipes-devtools/automake/automake_1.11.1.bb  |    3 ++-
 .../gnu-config/gnu-config_20111111.bb              |    4 ++--
 meta/recipes-devtools/m4/m4_1.4.16.bb              |    4 +++-
 meta/recipes-devtools/m4/m4_1.4.9.bb               |    4 +++-
 7 files changed, 20 insertions(+), 10 deletions(-)

[PATCH v2 1/5] gnu-config: Extend to provide nativesdk recipe

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

We need to provide autoconf-natviesdk in meta-toolchain, the
gnu-config-nativesdk is required by it.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 .../gnu-config/gnu-config_20111111.bb              |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
index 27400c6..0c652c2 100644
--- a/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
+++ b/meta/recipes-devtools/gnu-config/gnu-config_20111111.bb
@@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "perl-native-runtime"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://downloads.yoctoproject.org/releases/gnu-config/gnu-config-yocto-${PV}.tgz \
 	   file://config-guess-uclibc.patch \
@@ -38,4 +38,4 @@ do_install () {
 PACKAGES = "${PN}"
 FILES_${PN} = "${bindir} ${datadir}/gnu-config"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.0.4

[PATCH v2 2/5] m4: Extend to provide nativesdk recipe

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

We need to provide autoconf-natviesdk in meta-toolchain, the
m4-nativesdk is required by it.

Both extend the m4 recipes for GPLv2 and GPLv3.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-devtools/m4/m4_1.4.16.bb |    4 +++-
 meta/recipes-devtools/m4/m4_1.4.9.bb  |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/m4/m4_1.4.16.bb b/meta/recipes-devtools/m4/m4_1.4.16.bb
index b50c022..58b0491 100644
--- a/meta/recipes-devtools/m4/m4_1.4.16.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.16.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
 	file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d"
 
-PR = "r0"
+PR = "r1"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
            file://ac_config_links.patch"
 
@@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570
 inherit autotools
 
 EXTRA_OEMAKE += "'infodir=${infodir}'"
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-devtools/m4/m4_1.4.9.bb b/meta/recipes-devtools/m4/m4_1.4.9.bb
index 94c8bde..e79239b 100644
--- a/meta/recipes-devtools/m4/m4_1.4.9.bb
+++ b/meta/recipes-devtools/m4/m4_1.4.9.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe\
 	file://examples/COPYING;md5=1d49bd61dc590f014cae7173b43e3e5c"
 
-PR = "r0"
+PR = "r1"
 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
 	file://fix_for_circular_dependency.patch "
 
@@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bc
 inherit autotools
 
 EXTRA_OEMAKE += "'infodir=${infodir}'"
+
+BBCLASSEXTEND = "nativesdk"
-- 
1.7.0.4

[PATCH v2 3/5] automake: Extend to provide nativesdk recipe

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

We will provide autotools nativesdk in meta-tookchain for reconfigure
any autotools supported projects, as a part of the plan we should extend
their recipes first.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-devtools/automake/automake.inc       |    2 +-
 meta/recipes-devtools/automake/automake_1.11.1.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/automake/automake.inc b/meta/recipes-devtools/automake/automake.inc
index 370a972..25b0c0e 100644
--- a/meta/recipes-devtools/automake/automake.inc
+++ b/meta/recipes-devtools/automake/automake.inc
@@ -4,7 +4,7 @@ Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
 
diff --git a/meta/recipes-devtools/automake/automake_1.11.1.bb b/meta/recipes-devtools/automake/automake_1.11.1.bb
index 18450a0..ff8353f 100644
--- a/meta/recipes-devtools/automake/automake_1.11.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.1.bb
@@ -31,6 +31,7 @@ RDEPENDS_automake-native = "autoconf-native perl-native-runtime"
 
 PATHFIXPATCH = "file://path_prog_fixes.patch"
 PATHFIXPATCH_virtclass-native = ""
+PATHFIXPATCH_virtclass-nativesdk = ""
 
 SRC_URI += "${PATHFIXPATCH} \
 	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
@@ -44,4 +45,4 @@ do_install () {
 	install -d ${D}${datadir}
 }
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.0.4

[PATCH v2 4/5] autoconf: Extend to provide nativesdk recipe

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

As the same reason with automake, extend autoconf to provide
nativesdk recipe too.

This patch was only used for autoconf that running on target:
    * path_prog_fixes.patch: replace '@PERL@' with '@bindir@/env perl'

It's unavailable for autoconf-native and autoconf-nativesdk, so
exclude it for those two recipes.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-devtools/autoconf/autoconf_2.68.bb |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index 21b5fb3..9028e83 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 = "r3"
+PR = "r4"
 
 PARALLEL_MAKE = ""
 
@@ -14,7 +14,7 @@ SRC_URI += "file://autoreconf-include.patch \
 	    file://autoreconf-foreign.patch \
 	    file://autoreconf-gnuconfigize.patch \
 	    file://autoheader-nonfatal-warnings.patch \
-	    ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \
+	    ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d)]} \
             file://config_site.patch \
             file://remove-usr-local-lib-from-m4.patch \
            "
@@ -25,8 +25,11 @@ SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e57145
 DEPENDS_virtclass-native = "m4-native gnu-config-native"
 RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native"
 
+DEPENDS_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk"
+RDEPENDS_${PN}_virtclass-nativesdk = "m4-nativesdk gnu-config-nativesdk"
+
 SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch"
 
 EXTRA_OECONF += "ac_cv_path_M4=m4"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.0.4

[PATCH v2 5/5] task-sdk-host-nativesdk: add autotools nativesdk to meta-toolchain

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

Add automake-nativesdk and autoconf-nativesdk to meta-toolchain for
fixing the configure issue:
    WARNING: unrecognized options: --with-libtool-sysroot

This will allow user to run 'autoreconf' under their projects and
process the libtool m4 macros correctly.

[YOCTO #1603]

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
index 5ec40b1..920f359 100644
--- a/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
+++ b/meta/recipes-core/tasks/task-sdk-host-nativesdk.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
-PR = "r10"
+PR = "r11"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -22,6 +22,8 @@ RDEPENDS_${PN} = "\
     unfs-server-nativesdk \
     opkg-nativesdk \
     libtool-nativesdk \
+    autoconf-nativesdk \
+    automake-nativesdk \
     "
 
 RDEPENDS_${PN}_darwin8 = "\
-- 
1.7.0.4

Re: [PATCH v2 0/5] add autotools nativesdk to meta-toolchain

[Richard Purdie]

On Wed, 2011-11-30 at 16:45 +0800, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> v2 updates:
> 1) Extend m4 recipe with 'BBCLASSEXTEND="nativesdk"' instead of add
> new *-nativesdk.bb files;
> 
> 2) Add more comments to the commit messages.
> 
> [yocto #1603]
> 
> Add automake-nativesdk and autoconf-nativesdk into meta-toolchain to
> help users process any new libtool m4 macros in their projects, such
> as fix the configure issue:
>     WARNING: unrecognized options: --with-libtool-sysroot
> 
> Also add m4-nativesdk and gnu-config-nativesdk which required by
> autoconf-nativesdk.

Second version looks good, merged to master, thanks.

Richard