[poky] [RFC: enhance toolchain bootstrap process: v3: 7/7] eglibc, eglibc-nativesdk: fix the build due to changes to eglibc-initial and gcc-cross-intermediate

[Tian, Kevin]

> From: Dexuan Cui
> Sent: Tuesday, January 18, 2011 9:58 PM
> 
> BTW: I'm not very sure about the comments about CPPFLAGS and LDFLAGS, but
> I do
> need to pass the 2 variables to make eglibc build ok.

>From the commit history the special tweaks on CPPFLAGS and LDFLAGS exist for a long
time. It's possible that they're there due to a specific issue which doesn't exist now. Does
anyone remember the historical reason here? If not, and the intensive tests works fine,
perhaps it's safe to change them. :-)

Thanks
Kevin

> 
> Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
> ---
>  meta/recipes-core/eglibc/eglibc.inc     |    9 +++++++++
>  meta/recipes-core/eglibc/eglibc_2.12.bb |    8 ++------
>  2 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-core/eglibc/eglibc.inc
> b/meta/recipes-core/eglibc/eglibc.inc
> index 4698254..a61d35d 100644
> --- a/meta/recipes-core/eglibc/eglibc.inc
> +++ b/meta/recipes-core/eglibc/eglibc.inc
> @@ -1,5 +1,14 @@
>  require eglibc-common.inc
> 
> +STAGING_BINDIR_TOOLCHAIN_prepend =
> "${STAGING_DIR_NATIVE}${bindir_native}/${HOST_SYS}.gcc-cross-intermediat
> e:"
> +STAGING_BINDIR_TOOLCHAIN_virtclass-nativesdk_prepend =
> "${STAGING_DIR_NATIVE}${bindir_native}/${HOST_SYS}.gcc-crosssdk-intermed
> iate:"
> +
> +CPPFLAGS_prepend =
> "-I${STAGING_DIR_TARGET}/eglibc-initial/${TARGET_SYS}${includedir_native} "
> +CPPFLAGS_virtclass-nativesdk_prepend =
> "-I${STAGING_DIR_TARGET}/eglibc-initial-nativesdk/${SDK_ARCH}-nativesdk${S
> DK_VENDOR}-${SDK_OS}${base_prefix}${includedir_native} "
> +
> +LDFLAGS_prepend=
> "-L${STAGING_DIR_TARGET}${base_libdir}.gcc-cross-intermediate "
> +LDFLAGS_virtclass-nativesdk_prepend=
> "-L${STAGING_DIR_TARGET}${base_libdir}.gcc-crosssdk-intermediate "
> +
>  # nptl needs unwind support in gcc, which can't be built without glibc.
>  DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
>  #this leads to circular deps, so lets not add it yet
> diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb
> b/meta/recipes-core/eglibc/eglibc_2.12.bb
> index 97353b7..c325d1b 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.12.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
> @@ -2,7 +2,7 @@ require eglibc.inc
> 
>  DEPENDS += "gperf-native"
>  FILESPATHPKG =. "eglibc-svn:"
> -PR = "r14"
> +PR = "r15"
> 
>  EGLIBC_BRANCH="eglibc-2_12"
>  SRC_URI =
> "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
> \
> @@ -73,15 +73,13 @@ do_move_ports() {
>  do_configure () {
>  # override this function to avoid the autoconf/automake/aclocal/autoheader
>  # calls for now
> -# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
> -# version check and doesn't really help with anything
>          if [ -z "`which rpcgen`" ]; then
>                  echo "rpcgen not found.  Install glibc-devel."
>                  exit 1
>          fi
>          (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
>          find ${S} -name "configure" | xargs touch
> -        CPPFLAGS="" oe_runconf
> +        oe_runconf
>  }
> 
>  rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
> @@ -89,8 +87,6 @@ rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
>  	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
> 
>  do_compile () {
> -	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another
> glibc is in staging
> -	unset LDFLAGS
>  	base_do_compile
>  	(
>  		cd ${S}/sunrpc/rpcsvc
> --
> 1.7.2
> 
> _______________________________________________
> poky mailing list
> poky at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky