From 7a4f2b0d2af6acf5109dbc888f9aa523f2f8706d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 21 Mar 2007 14:04:58 +0000 Subject: [PATCH] * changed uclibc.conf to have uC_arch variable set globally and not only inside default_config() * improved uclibc to properly set uC_arch for powerpc git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20527 10447126-35f2-4685-b0cf-6dd780d3921f --- base/uclibc/uclibc.conf | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/base/uclibc/uclibc.conf b/base/uclibc/uclibc.conf index 32d0df9db..855c3d131 100644 --- a/base/uclibc/uclibc.conf +++ b/base/uclibc/uclibc.conf @@ -22,18 +22,19 @@ if [ -e $targetdir/uclibc.config ] ; then var_append conffiles ' ' $targetdir/uclibc.config fi +uC_arch=$( echo $arch | arch2uname | sed -e 's/ppc/powerpc/' ) + default_config() { - local uC_arch="$1" echo "X TARGET_$uC_arch" if [ "$arch_bigendian" = "yes" ]; then echo "X ARCH_BIG_ENDIAN" - echo "X ARCH_WANTS_BIG_ENDIAN" else echo "X ARCH_LITTLE_ENDIAN" - echo "X ARCH_WANTS_LITTLE_ENDIAN" fi + echo "X CROSS_COMPILER_PREFIX \"${archprefix}\"" + # PREFIX if atstage toolchain; then echo "X KERNEL_SOURCE \"$base/build/$SDECFG_ID/usr\"" @@ -48,6 +49,7 @@ default_config() { # ld.so preload echo "X LDSO_PRELOAD_FILE_SUPPORT" + echo "X HAVE_SHARED" else echo "O HAVE_SHARED" fi @@ -90,14 +92,13 @@ default_config() { } runconf=0 + hook_add premake 5 "uclibc_config" uclibc_config() { - local uC_arch=$( echo $arch | arch2uname ) + # generate default config rules + default_config > $builddir/.config - # generate default_config - default_config $uC_arch > $builddir/.config - - eval $MAKE defconfig ARCH=$uC_arch + eval $MAKE defconfig conffiles_loop 2 TARGET_ARCH=$uC_arch } @@ -107,6 +108,7 @@ if atstage toolchain; then else var_append makeopt ' ' "PREFIX=$root" fi + makeinstopt="$makeopt -j 1" var_append makeopt ' ' "CROSS=${archprefix}" @@ -124,5 +126,5 @@ else var_append makeinstopt ' ' "install_utils" fi -hook_add postdoc 5 'cp -v .config $root/$docdir/' +hook_add postdoc 5 'cp -vf .config $root/$docdir/'