From 3909b764b74ed9fd99ff97c49e9ee12890478015 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Mar 2011 20:18:32 -0700 Subject: recipes: Use -uclibceabi instead of -uclibcgnueabi (From OE-Core rev: 3aa429406184d27bdb8a771c4c12bde1dcccb95b) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch | 2 +- meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch | 2 +- .../openssl/openssl-0.9.8p/configure-targets.patch | 4 ++-- meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch | 2 +- meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-configure-sdk.inc | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch index 1bfe724750..600af79149 100644 --- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch +++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch @@ -63,7 +63,7 @@ diff -uNr pciutils-3.1.5.orig/lib/configure pciutils-3.1.5/lib/configure + sys=linux +fi + -+if [ "$host" = "linux--uclibcgnueabi" ] ++if [ "$host" = "linux--uclibceabi" ] +then + sys=linux +fi diff --git a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch index 9072d2a68f..f1fcb332ce 100644 --- a/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch +++ b/meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch @@ -25,7 +25,7 @@ index 4318b05..84f6acb 100755 - sys=linux -fi - --if [ "$host" = "linux--uclibcgnueabi" ] +-if [ "$host" = "linux--uclibceabi" ] -then - sys=linux -fi diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch index b68123a233..6fd27690ae 100644 --- a/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch +++ b/meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch @@ -14,8 +14,8 @@ Index: openssl-0.9.8g/Configure +"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-uclibcgnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-uclibcgnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + +"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", + diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch index acebe5308f..74e4a5af04 100644 --- a/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch +++ b/meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch @@ -5,7 +5,7 @@ tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm" case ${target} in - arm*-*-linux-gnueabi) -+ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi) tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi" # The BPABI long long divmod functions return a 128-bit value in diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 43937778f1..f7b5836c4f 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -48,7 +48,7 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" -EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" +EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit" EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" CPPFLAGS = "" diff --git a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc index 756e74e48d..de80870310 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-sdk.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-sdk.inc @@ -2,7 +2,7 @@ require gcc-configure-common.inc # The two lines below conflict, this needs fixing - RP USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' -USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}' EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \ --with-gxx-include-dir=${target_includedir}/c++ \ -- cgit v1.2.3-54-g00ecf