add autotools nativesdk to meta-toolchain

From: Wenzong Fan <[email protected]>

[yocto #1603]

Add automake-nativesdk and autoconf-nativesdk into meta-toolchain, this will help to process new libtool m4 macros in any autotools project, such as support for '--with-libtool-sysroot' option.

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

The following changes since commit 4cd96710785eb05abeff1f281878655118d4a7dd:
Richard Purdie (1):
bitbake: Update users of getVar/setVar to use the data store functions directly

are available in the git repository at:

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

Wenzong Fan (5):
gnu-config: Extend to provide nativesdk recipe
m4: Add m4-nativesdk recipes
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-nativesdk_1.4.16.bb    |   12 ++++++++++++
 meta/recipes-devtools/m4/m4-nativesdk_1.4.9.bb     |   12 ++++++++++++
 7 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 meta/recipes-devtools/m4/m4-nativesdk_1.4.16.bb
 create mode 100644 meta/recipes-devtools/m4/m4-nativesdk_1.4.9.bb

From: Wenzong Fan <[email protected]>

[YOCTO #1603]

gnu-config-nativesdk is required by autoconf-nativesdk.

---
 .../gnu-config/gnu-config_20111111.bb              |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index 27400c6..0c652c2 100644
@@ -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

From: Wenzong Fan <[email protected]>

[YOCTO #1603]

m4-nativesdk is required by autoconf-nativesdk.

---
 meta/recipes-devtools/m4/m4-nativesdk_1.4.16.bb |   12 ++++++++++++
 meta/recipes-devtools/m4/m4-nativesdk_1.4.9.bb  |   12 ++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/m4/m4-nativesdk_1.4.16.bb
 create mode 100644 meta/recipes-devtools/m4/m4-nativesdk_1.4.9.bb

new file mode 100644
index 0000000..f1be0c8
@@ -0,0 +1,12 @@
+require m4_${PV}.bb
+inherit nativesdk
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-nativesdk"
+
+do_configure()  {
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+	oe_runconf
+}
+

new file mode 100644
index 0000000..f1be0c8
@@ -0,0 +1,12 @@
+require m4_${PV}.bb
+inherit nativesdk
+
+INHIBIT_AUTOTOOLS_DEPS = "1"
+DEPENDS += "gnu-config-nativesdk"
+
+do_configure()  {
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.sub .
+	install -m 0644 ${STAGING_DATADIR}/gnu-config/config.guess .
+	oe_runconf
+}
+

1.7.0.4

Is there a reason we don't just extend the m4 recipe for native and nativesdk? (I'm just curious)

-M

Its a good question, BBCLASSEXTEND = "nativesdk" should really work and those recipes look wrong (they shouldn't need to set INHIBIT_AUTOTOOLS_DEPS = "1" or have the custom do_configure).

The m4-native recipe is a little tricker as its one of the early bootstrap dependencies required by autotools. This is why it does need the INHIBIT_AUTOTOOLS_DEPS and custom do_configure line although those should be possible with modern BBCLASSEXTEND...

Cheers,

Richard

Ah, this works. I'll extend the m4 recipe to support 'nativesdk'

Thanks for let me know the story, this really confused me when I deciding copy/extend for the m4-nativesdk.

Wenzong

From: Wenzong Fan <[email protected]>

[YOCTO #1603]

automake-nativesdk should be added into meta-toolchain.

---
 meta/recipes-devtools/automake/automake.inc       |    2 +-
 meta/recipes-devtools/automake/automake_1.11.1.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

index 370a972..25b0c0e 100644
@@ -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 "
 

index 18450a0..ff8353f 100644
@@ -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

From: Wenzong Fan <[email protected]>

[YOCTO #1603]

autoconf-nativesdk should be added into meta-toolchain.

---
 meta/recipes-devtools/autoconf/autoconf_2.68.bb |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

index 21b5fb3..9028e83 100644
@@ -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

Op 29 nov. 2011, om 09:39 heeft <[email protected]> <[email protected]> het volgende geschreven:

For every recipe: what is '[yocto #1603]'?

http://bugzilla.pokylinux.org/show_bug.cgi?id=1603

The updates to each recipe was related to this requirement for yocto 1.2, so I add the id number in all commit messages.

Thanks
Wenzong

What Koen is asking for in a rather cryptic fashion is for more explanation of the change being made in the commit message. The bug ID is fine as a reference but we shouldn't rely on that to explain what the change is and why its needed.

Cheers,

Richard

Op 29 nov. 2011, om 10:00 heeft wenzong fan het volgende geschreven:

If you add such IDs you need to add a lot more info like a summary of the bugreport. People reading commit logs aren't going to know and URI to yocto bz (especially in OE-core git) and even if they'd know, opening a webbrowser to understand a commit message is not good.

You are right, I'll update the commit messages and add more info to it, thanks for your advises.

Wenzong

From: Wenzong Fan <[email protected]>

[YOCTO #1603]

Add automake-nativesdk and autoconf-nationsdk into meta-toolchain.

---
 meta/recipes-core/tasks/task-sdk-host-nativesdk.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

index 5ec40b1..920f359 100644
@@ -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