summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-31 20:18:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 14:09:33 +0100
commit3909b764b74ed9fd99ff97c49e9ee12890478015 (patch)
treedb06f8f5b47947f689e90a65c4f60514596220e3
parent434f139f812079e2d6d78e89af69778c4282a8ed (diff)
downloadpoky-3909b764b74ed9fd99ff97c49e9ee12890478015.tar.gz
recipes: Use -uclibceabi instead of -uclibcgnueabi
(From OE-Core rev: 3aa429406184d27bdb8a771c4c12bde1dcccb95b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.7/configure.patch2
-rw-r--r--meta/recipes-bsp/pciutils/pciutils-3.1.7/guess-fix.patch2
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8p/configure-targets.patch4
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.3.3/110-arm-eabi.patch2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-sdk.inc2
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
63+ sys=linux 63+ sys=linux
64+fi 64+fi
65+ 65+
66+if [ "$host" = "linux--uclibcgnueabi" ] 66+if [ "$host" = "linux--uclibceabi" ]
67+then 67+then
68+ sys=linux 68+ sys=linux
69+fi 69+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
25- sys=linux 25- sys=linux
26-fi 26-fi
27- 27-
28-if [ "$host" = "linux--uclibcgnueabi" ] 28-if [ "$host" = "linux--uclibceabi" ]
29-then 29-then
30- sys=linux 30- sys=linux
31-fi 31-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
14+"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)", 14+"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)",
15+"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)", 15+"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)",
16+"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)", 16+"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)",
17+"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)", 17+"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)",
18+"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)", 18+"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)",
19+ 19+
20+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", 20+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
21+ 21+
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 @@
5 tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm" 5 tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm"
6 case ${target} in 6 case ${target} in
7- arm*-*-linux-gnueabi) 7- arm*-*-linux-gnueabi)
8+ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) 8+ arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
9 tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" 9 tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
10 tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi" 10 tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
11 # The BPABI long long divmod functions return a 128-bit value in 11 # 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,
48EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" 48EXTRA_OECONF_append_linux = " --enable-__cxa_atexit"
49EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" 49EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit"
50EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" 50EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit"
51EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" 51EXTRA_OECONF_append_linux-uclibceabi = " --disable-__cxa_atexit"
52EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" 52EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
53CPPFLAGS = "" 53CPPFLAGS = ""
54 54
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
2 2
3# The two lines below conflict, this needs fixing - RP 3# The two lines below conflict, this needs fixing - RP
4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' 4USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' 5USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}'
6 6
7EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \ 7EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/sysroots/${TARGET_SYS}${target_exec_prefix} \
8 --with-gxx-include-dir=${target_includedir}/c++ \ 8 --with-gxx-include-dir=${target_includedir}/c++ \