[PATCH 0/1] Add env setting to support libtool2.4 m4 macro

[PATCH 0/1] Add env setting to support libtool2.4 m4 macro

[Jessica Zhang]

Add OECORE_ACLOCAL_OPTS to env setup scripts for options
running aclocal to generate correct libtool 2.4 m4 macro, 
the autogen.sh should be changed as aclocal ${OECORE_ACLOCAL_OPTS}
The following changes since commit c412674cf818e77e35857fb93353e392e7ac9e53:
  Khem Raj (1):
        package.bbclass,prserv.bbclass: Compare USE_PR_SERV with "1" or "0"

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jzhang/aclocal
  http://git.yoctoproject.org/cgit.cgi//log/?h=jzhang/aclocal

Jessica Zhang (1):
  Add OECORE_ACLOCAL_OPTS to env setup scripts for autotool project
    using correct libtool 2.4

 meta/classes/toolchain-scripts.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

[PATCH 1/1] Add OECORE_ACLOCAL_OPTS to env setup scripts for autotool project using correct libtool 2.4

[Jessica Zhang]

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
 meta/classes/toolchain-scripts.bbclass |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 09ecd7c..3301319 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -28,6 +28,7 @@ toolchain_create_sdk_env_script () {
 	echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
+	echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 }
 
@@ -59,6 +60,7 @@ toolchain_create_tree_env_script () {
 	echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
+	echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer
@@ -89,6 +91,7 @@ toolchain_create_sdk_env_script_for_installer () {
 	echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
 	echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
 	echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
+        echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
 	echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 	echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
-- 
1.7.0.4

Re: [PATCH 0/1] Add env setting to support libtool2.4 m4 macro

[Richard Purdie]

On Wed, 2011-06-29 at 16:09 -0700, Jessica Zhang wrote:
> Add OECORE_ACLOCAL_OPTS to env setup scripts for options
> running aclocal to generate correct libtool 2.4 m4 macro, 
> the autogen.sh should be changed as aclocal ${OECORE_ACLOCAL_OPTS}
> The following changes since commit c412674cf818e77e35857fb93353e392e7ac9e53:
>   Khem Raj (1):
>         package.bbclass,prserv.bbclass: Compare USE_PR_SERV with "1" or "0"
> 
> are available in the git repository at:
> 
>   git://git.yoctoproject.org/poky-contrib jzhang/aclocal
>   http://git.yoctoproject.org/cgit.cgi//log/?h=jzhang/aclocal
> 
> Jessica Zhang (1):
>   Add OECORE_ACLOCAL_OPTS to env setup scripts for autotool project
>     using correct libtool 2.4

Merged to master, thanks.

Richard