libtool: Use more clean way to set ac_cv_path_* variables. Never load libtool.inc...

diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index 256e71c05aae1247a53f0be78d044ad819c82529..910ff1206669548524351d268f7d872424dac93d 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb
index 949031146c37a58f230ee24af3be6c053ebd44cd..b0cee4eebb52b704aa93b49e13835d868788aca5 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -1,6 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb
index 2a7e4d728874ac8997588bc18f9d6bac0f9924dc..1f8527873f4236f0ee0bd32e3b87e6718304e248 100644 (file)
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb
index e2c6bbeb6ad859a91bd18a9240487a4fa8dcbcff..31a67f5bd10122a2a42a064bbe35c564a872a9fd 100644 (file)
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
@@ -22,11 +21,6 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-       export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_compile () {
        :
 }

diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb
index b26e7cc26a5e112f67dd4d3c987d3ce74b3b964f..23c16829ab5c772007d18a381ea758b97f0ec4cc 100644 (file)
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 
@@ -20,11 +19,6 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-       export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_compile () {
        :
 }

diff --git a/recipes/libtool/libtool-native_1.5.10.bb b/recipes/libtool/libtool-native_1.5.10.bb
index 362aea22f71f9211e275ade2c182d94f8221aedc..76cbb4baf0f63a573c3b98a7e78a189f56af884c 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.10.bb
+++ b/recipes/libtool/libtool-native_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-native_1.5.22.bb b/recipes/libtool/libtool-native_1.5.22.bb
index 4d660f4965b4df921ec7f45228780cc3dd77d42e..3aadb2be017716720e7ff0f97facf70eb85e79d4 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.22.bb
+++ b/recipes/libtool/libtool-native_1.5.22.bb
@@ -1,6 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-native_1.5.24.bb b/recipes/libtool/libtool-native_1.5.24.bb
index 95368819bb40ead5be4363dd349e9502148cb6b4..f767afcd6300643a91c1f1f5c8341770f7113c4d 100644 (file)
--- a/recipes/libtool/libtool-native_1.5.24.bb
+++ b/recipes/libtool/libtool-native_1.5.24.bb
@@ -1,6 +1,5 @@
 SECTION = "devel"
 
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-native_2.2.4.bb b/recipes/libtool/libtool-native_2.2.4.bb
index 06564c74c391f4cb56968e7e2a279751e11a7b7b..a7ad685909575e7b85d97827b0cac600a05c8012 100644 (file)
--- a/recipes/libtool/libtool-native_2.2.4.bb
+++ b/recipes/libtool/libtool-native_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 

diff --git a/recipes/libtool/libtool-native_2.2.6a.bb b/recipes/libtool/libtool-native_2.2.6a.bb
index e699a2f33c28a767ceec279ab9ac147296a1f1b3..082663a2803613ca8a388176e8f2b21ce7778d7c 100644 (file)
--- a/recipes/libtool/libtool-native_2.2.6a.bb
+++ b/recipes/libtool/libtool-native_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 PR = "${INC_PR}.0"
 

diff --git a/recipes/libtool/libtool-sdk_1.5.10.bb b/recipes/libtool/libtool-sdk_1.5.10.bb
index 21e408dc73fe2b81716a6aa16b4b1faae3f2171a..ac188bdecd288acdf2e814416402407cf15cb8a3 100644 (file)
--- a/recipes/libtool/libtool-sdk_1.5.10.bb
+++ b/recipes/libtool/libtool-sdk_1.5.10.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"

diff --git a/recipes/libtool/libtool-sdk_2.2.4.bb b/recipes/libtool/libtool-sdk_2.2.4.bb
index 0e9ae9b66e41c84a7492c8f90722d7c54645262e..c934a6e390ac437cfd93a022547c11a447f8c697 100644 (file)
--- a/recipes/libtool/libtool-sdk_2.2.4.bb
+++ b/recipes/libtool/libtool-sdk_2.2.4.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
@@ -9,11 +8,6 @@ S = "${WORKDIR}/libtool-${PV}"
 
 inherit sdk
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-       export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_install () {
        install -d ${D}${bindir}/
        install -m 0755 libtool ${D}${bindir}/

diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb
index 263879beeb464cef798fed92657cab6505baeb33..7e269ef38159b47d5d9f3f079c374f6197ea2e0f 100644 (file)
--- a/recipes/libtool/libtool-sdk_2.2.6a.bb
+++ b/recipes/libtool/libtool-sdk_2.2.6a.bb
@@ -1,4 +1,3 @@
-require libtool.inc
 require libtool_${PV}.bb
 
 PR = "${INC_PR}.0"
@@ -6,11 +5,6 @@ SRC_URI_append = " file://cross_compile.patch;patch=1"
 
 inherit sdk
 
-# skip ac_cv_... setting for cross build: host paths must be used
-do_configure_prepend () {
-       export LIBTOOL_BB_DO_NOT_SET_PATHS=1
-}
-
 do_install () {
        install -d ${D}${bindir}/
        install -m 0755 libtool ${D}${bindir}/

diff --git a/recipes/libtool/libtool.inc b/recipes/libtool/libtool.inc
index 9cc74010c6d988b6a387418bc05fc54f48d0d001..838f029236e598aff38d6ce3ea78b996011c9911 100644 (file)
--- a/recipes/libtool/libtool.inc
+++ b/recipes/libtool/libtool.inc
@@ -6,6 +6,16 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
 
-INC_PR = "r24"
+INC_PR = "r25"
 
 FILESPATHPKG=. "libtool-${PV}:"
+
+do_configure_prepend () {
+       if ${@['true', 'false'][bb.data.inherits_class('native', d) or bb.data.inherits_class('sdk', d) or (bb.data.getVar('PN', d, 1) == 'libtool-cross')]}
+       then
+               export ac_cv_path_SED="${ac_cv_path_SED=${base_bindir}/sed}"
+               export ac_cv_path_GREP="${ac_cv_path_GREP=${base_bindir}/grep}"
+               export ac_cv_path_EGREP="${ac_cv_path_EGREP=${base_bindir}/grep -E}"
+               export ac_cv_path_FGREP="${ac_cv_path_FGREP=${base_bindir}/grep -F}"
+       fi
+}

diff --git a/recipes/libtool/libtool_2.2.4.bb b/recipes/libtool/libtool_2.2.4.bb
index 6de73364062441a53943273a8cd88c92618def88..65c2d178ab465120cae37acdaa376ac4cdba5139 100644 (file)
--- a/recipes/libtool/libtool_2.2.4.bb
+++ b/recipes/libtool/libtool_2.2.4.bb
@@ -14,18 +14,6 @@ inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
-do_configure_prepend () {
-       # Skip this for native build:
-       if test -n "$CONFIG_SITE" ; then
-       if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then
-                       export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}"
-                       export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}"
-                       export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}"
-                       export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}"
-               fi
-       fi
-}
-
 do_stage () {
        install -d ${STAGING_INCDIR}/libltdl
        install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/

diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb
index c69a937f16ef3436e5a411160ce5a9dcf08161a6..0595613159a290c59aa3971fb69c4a2927959414 100644 (file)
--- a/recipes/libtool/libtool_2.2.6a.bb
+++ b/recipes/libtool/libtool_2.2.6a.bb
@@ -16,18 +16,6 @@ inherit autotools
 
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
-do_configure_prepend () {
-       # Skip this for native build:
-       if test -n "$CONFIG_SITE" ; then
-       if test -z "$LIBTOOL_BB_DO_NOT_SET_PATHS" ; then
-                       export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}"
-                       export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}"
-                       export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}"
-                       export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}"
-               fi
-       fi
-}
-
 do_stage () {
        install -d ${STAGING_INCDIR}/libltdl
        install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/