Use the gettext oeclass in the gcc builds, and add a bit to manipulate the stdc++ clocale when USE_NLS is 'no'.

BKrev: 41999c85DGdJXQ9gd_bowsgp6QnQ_w

5 files changed, 22 insertions, 13 deletions

diff --git a/gcc/gcc_3.3.3.oe b/gcc/gcc_3.3.3.oe
index 9dfa1a8089..fafc344fb5 100644
--- a/gcc/gcc_3.3.3.oe
+++ b/gcc/gcc_3.3.3.oe
@@ -1,5 +1,6 @@
 SECTION = "devel"
-inherit autotools
+PR = "r1"
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
@@ -96,7 +97,7 @@ ${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-multilib \
diff --git a/gcc/gcc_3.3.4.oe b/gcc/gcc_3.3.4.oe
index b413628bcc..354e078dd9 100644
--- a/gcc/gcc_3.3.4.oe
+++ b/gcc/gcc_3.3.4.oe
@@ -1,5 +1,6 @@
 SECTION = "devel"
-inherit autotools
+PR = "r1"
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
@@ -74,7 +75,7 @@ ${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-multilib \
diff --git a/gcc/gcc_3.4.0.oe b/gcc/gcc_3.4.0.oe
index 1dbde82100..22fa5e2747 100644
--- a/gcc/gcc_3.4.0.oe
+++ b/gcc/gcc_3.4.0.oe
@@ -1,7 +1,7 @@
 SECTION = "devel"
-PR = "r1"
+PR = "r2"
 
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
@@ -91,7 +91,7 @@ ${GNU_MIRROR}/gcc/releases/	http://gcc.get-software.com/releases/
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-target-optspace \
diff --git a/gcc/gcc_3.4.1.oe b/gcc/gcc_3.4.1.oe
index 6782d98ead..58001c4d4d 100644
--- a/gcc/gcc_3.4.1.oe
+++ b/gcc/gcc_3.4.1.oe
@@ -1,7 +1,7 @@
 SECTION = "devel"
-PR = "r1"
+PR = "r2"
 
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 LICENSE = "GPL"
@@ -89,7 +89,7 @@ ${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-target-optspace \
diff --git a/gcc/gcc_3.4.2.oe b/gcc/gcc_3.4.2.oe
index 9c994bbd72..11bf45b52f 100644
--- a/gcc/gcc_3.4.2.oe
+++ b/gcc/gcc_3.4.2.oe
@@ -1,6 +1,6 @@
-PR = "r1"
+PR = "r2"
 
-inherit autotools
+inherit autotools gettext
 
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
@@ -90,7 +90,7 @@ ${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
 S = "${WORKDIR}/gcc-${PV}"
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
-EXTRA_OECONF = "--disable-nls \
+EXTRA_OECONF = "${@['--enable-clocale=generic', ''][oe.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
                 --enable-shared \
                 --enable-target-optspace \
@@ -125,6 +125,7 @@ python __anonymous () {
         oe.data.setVar('EXTRA_OECONF_DEP', '${EXTRA_OECONF_glibc}', d)
 }
 
+CPPFLAGS = ""
 do_configure () {
 	# Setup these vars for cross building only
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
@@ -137,6 +138,12 @@ do_configure () {
 		export AR_FOR_TARGET="${HOST_PREFIX}ar"
 		export RANLIB_FOR_TARGET="${HOST_PREFIX}ranlib"
 	fi
+	export CC_FOR_BUILD="${BUILD_CC}"
+	export CXX_FOR_BUILD="${BUILD_CXX}"
+	export CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
+	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
+	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }