summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/gcc-cross-initial_3.3.3.oe3
-rw-r--r--gcc/gcc-cross-initial_3.4.0.oe3
-rw-r--r--gcc/gcc-cross_3.3.3.oe18
-rw-r--r--gcc/gcc-cross_3.4.0.oe16
-rw-r--r--gcc/gcc_3.3.3.oe39
-rw-r--r--gcc/gcc_3.4.0.oe39
6 files changed, 64 insertions, 54 deletions
diff --git a/gcc/gcc-cross-initial_3.3.3.oe b/gcc/gcc-cross-initial_3.3.3.oe
index c1a01c1593..9a9c1f4dc1 100644
--- a/gcc/gcc-cross-initial_3.3.3.oe
+++ b/gcc/gcc-cross-initial_3.3.3.oe
@@ -3,13 +3,14 @@ include gcc-cross_${PV}.oe
DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
+# This is intended to be a -very- basic config
EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
--with-newlib \
--disable-nls \
--disable-shared \
--disable-threads \
--disable-multilib \
- --enable-__cxa_atexit \
+ --disable-__cxa_atexit \
--enable-languages=c \
--enable-target-optspace \
--program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-cross-initial_3.4.0.oe b/gcc/gcc-cross-initial_3.4.0.oe
index b800e1927e..fcc9a05645 100644
--- a/gcc/gcc-cross-initial_3.4.0.oe
+++ b/gcc/gcc-cross-initial_3.4.0.oe
@@ -5,13 +5,14 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
PACKAGES = ""
+# This is intended to be a -very- basic config
EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
--with-newlib \
--disable-nls \
--disable-shared \
--disable-threads \
--disable-multilib \
- --enable-__cxa_atexit \
+ --disable-__cxa_atexit \
--enable-languages=c \
--enable-target-optspace \
--program-prefix=${TARGET_PREFIX}"
diff --git a/gcc/gcc-cross_3.3.3.oe b/gcc/gcc-cross_3.3.3.oe
index d172d6ac0b..5619ce6b59 100644
--- a/gcc/gcc-cross_3.3.3.oe
+++ b/gcc/gcc-cross_3.3.3.oe
@@ -8,22 +8,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PACKAGES = "libgcc"
INHIBIT_PACKAGE_STRIP = 1
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
- --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
- --disable-nls \
- --with-gnu-ld \
- --enable-multilib \
- --enable-threads=posix \
- --enable-symvers=gnu \
- --enable-__cxa_atexit \
- --enable-languages=c,c++,f77 \
- --enable-shared \
- --enable-c99 \
- --enable-long-long \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX}"
-
-FILES_libgcc = "/lib/libgcc_s.so.*"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+ --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
export CPPFLAGS = ""
export CXXFLAGS = ""
diff --git a/gcc/gcc-cross_3.4.0.oe b/gcc/gcc-cross_3.4.0.oe
index 8238e815da..6d68eaeb65 100644
--- a/gcc/gcc-cross_3.4.0.oe
+++ b/gcc/gcc-cross_3.4.0.oe
@@ -9,20 +9,8 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PACKAGES = "libgcc libstdc++ libg2c"
INHIBIT_PACKAGE_STRIP = 1
-EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
- --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++ \
- --disable-nls \
- --with-gnu-ld \
- --enable-multilib \
- --enable-threads=posix \
- --enable-symvers=gnu \
- --enable-__cxa_atexit \
- --enable-languages=c,c++,f77 \
- --enable-shared \
- --enable-c99 \
- --enable-long-long \
- --enable-target-optspace \
- --program-prefix=${TARGET_PREFIX}"
+EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \
+ --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++"
export CPPFLAGS = ""
export CXXFLAGS = ""
diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 6388351e43..166a8a0ff5 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -135,17 +135,34 @@ python do_patch () {
S = "${WORKDIR}/gcc-${PV}"
B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
- --with-gxx-include-dir=${includedir}/c++/${PV} \
- --enable-target-optspace \
- --disable-nls \
- --with-gnu-ld \
- --disable-__cxa_atexit \
- --enable-languages=c,c++,f77 \
- --enable-shared \
- --enable-multilib \
- --enable-threads=posix \
- --program-prefix=${TARGET_PREFIX}"
+EXTRA_OECONF = "--disable-nls \
+ --with-gnu-ld \
+ --enable-shared \
+ --enable-multilib \
+ --enable-target-optspace \
+ --enable-languages=c,c++,f77 \
+ --enable-threads=posix \
+ --enable-c99 \
+ --enable-long-long \
+ --enable-symvers=gnu \
+ --program-prefix=${TARGET_PREFIX} \
+ ${EXTRA_OECONF_PATHS} \
+ ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+ --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+
+python __anonymous () {
+ import oe, re
+ if (re.match('linux-uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+ oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+ elif (re.match('linux$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+ oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
do_configure () {
# Setup these vars for cross building only
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index b486ccfef2..ee26a23fc4 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -129,17 +129,34 @@ python do_patch () {
S = "${WORKDIR}/gcc-${PV}"
B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
-EXTRA_OECONF = "--with-local-prefix=${prefix}/local \
- --with-gxx-include-dir=${includedir}/c++/${PV} \
- --enable-target-optspace \
- --disable-nls \
- --with-gnu-ld \
- --disable-__cxa_atexit \
- --enable-languages=c,c++,f77 \
- --enable-shared \
- --enable-multilib \
- --enable-threads=posix \
- --program-prefix=${TARGET_PREFIX}"
+EXTRA_OECONF = "--disable-nls \
+ --with-gnu-ld \
+ --enable-shared \
+ --enable-multilib \
+ --enable-target-optspace \
+ --enable-languages=c,c++,f77 \
+ --enable-threads=posix \
+ --enable-c99 \
+ --enable-long-long \
+ --enable-symvers=gnu \
+ --program-prefix=${TARGET_PREFIX} \
+ ${EXTRA_OECONF_PATHS} \
+ ${EXTRA_OECONF_DEP}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+ --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+EXTRA_OECONF_DEP = ""
+EXTRA_OECONF_uclibc = "--disable-__cxa_atexit"
+EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
+
+python __anonymous () {
+ import oe, re
+ if (re.match('linux-uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+ oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_uclibc}', d)
+ elif (re.match('linux$', oe.data.getVar('TARGET_OS', d, 1)) != None):
+ oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
+}
do_configure () {
# Setup these vars for cross building only