[poky] [PATCH 1/9] libtool: changes to enable sysroot support

[Richard Purdie]

On Tue, 2011-01-18 at 20:19 -0800, Scott Garman wrote:
> * Added OE patches by Khem Raj which enable sysroot support
>   and rename the command line option --with-sysroot to
>   --with-libtool-sysroot to avoid conflicts with binutils and
>   gcc
> * Stage the -cross and -native libtool in the same relative path
>   so it can be accessed equally well from recipes using
>   BBCLASSEXTEND = "native"
> * Removed obsolete cross_compile.patch
> * Reorganized common things to libtool.inc
> * Changed SRC_URI_append to SRC_URI +=
> * PR bump for all recipes

I'm afraid this patch has too many changes rolled into one. Not all of
these changes are sysroot related.


> diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> index 6ea96a5..91ab64b 100644
> --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
> @@ -1,9 +1,10 @@
> -require libtool_${PV}.bb
> +require libtool.inc
>  
> -PR = "r0"
> -PACKAGES = ""
> -SRC_URI_append = " file://cross_compile.patch \
> -		   file://prefix.patch "
> +PR = "r1"
> +SRC_URI += "file://prefix.patch"
> +
> +SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
> +SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
>  
>  DEPENDS += "libtool-native"
>  
> @@ -18,10 +19,11 @@ do_install () {
>  	install -d ${D}${bindir}/
>  	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
>  	install -d ${D}${datadir}/libtool/
> +	install -d ${D}${datadir}/libtool/config
>  	install -d ${D}${datadir}/aclocal/
> -	install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/
> -	install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/
> -	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/
> +	install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/config/
> +	install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/config/
> +	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/config/
>  	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
>  	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
>  }

The PACKAGES = "" is dropped here?

> diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> index 4ad660b..014c9fa 100644
> --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
> @@ -1,13 +1,17 @@
> -require libtool_${PV}.bb
> +require libtool.inc
>  
>  DEPENDS = ""
>  
> -PR = "r0"
> -SRC_URI_append = " file://cross_compile.patch \
> -		   file://prefix.patch "
> +PR = "r1"
> +SRC_URI += "file://prefix.patch"
> +
> +SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
> +SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
>  
>  inherit native
>  
> +EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
> +
>  do_configure_prepend () {
>  	# Remove any existing libtool m4 since old stale versions would break
>  	# any upgrade
> @@ -21,5 +25,3 @@ do_install () {
>  	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
>  }
>  
> -SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
> -SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
> diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> index c9f24a9..d4d075f 100644
> --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
> @@ -1,8 +1,12 @@
>  require libtool_${PV}.bb
>  
> -PR = "r0"
> -SRC_URI_append = " file://cross_compile.patch \
> -		   file://prefix.patch "
> +# Let nativesdk recipe not provide PACKAGES provided by libtool.
> +# Otherwise when an image wants say libltdl-dev, it picks up
> +# libtool-nativesdk instead of libtool recipe to provide it.
> +PACKAGES = ""
> +
> +PR = "r1"
> +SRC_URI += "file://prefix.patch"
>  
>  inherit nativesdk

and in particular, this PACKAGES setting sounds totally wrong to me.

Now the trouble is I can't take any of this work without unravelling
these two changes that worry me.

Cheers,

Richard