[oe-commits] org.oe.dev merge of 'aadc54707d1990050b64f5354702d6454308b093'
mickeyl commit
oe at amethyst.openembedded.net
Tue Jul 22 22:18:44 UTC 2008
merge of 'aadc54707d1990050b64f5354702d6454308b093'
and 'd2cf665b4d3013caa5979709d44b24fb0f2a9812'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: de9ca24b1a6fcf987fbe230d064437535732d4f1
ViewMTN: http://monotone.openembedded.org/revision/info/de9ca24b1a6fcf987fbe230d064437535732d4f1
Files:
1
packages/openmoko-projects/illume-theme_svn.bb
packages/openmoko-projects/illume-theme-asu_svn.bb
packages/freesmartphone/illume-theme-freesmartphone_git.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/images/fso-image.bb
packages/openmoko-projects/illume_svn.bb
packages/qt4/qt4-x11-free-4.4.0
packages/dsplink/files/ticel-config
packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
packages/mythtv/mythtv/ifdef-qt.diff
packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch
packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch
packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch
packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch
packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch
packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch
packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch
packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch
packages/qt4/qt4-x11-free-4.4.0/build-tools.patch
packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf
packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h
packages/qt4/qt4-x11-free_4.4.0.bb
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/freesmartphone/zhone_git.bb
packages/gcc/gcc-4.3.1.inc
packages/gcc/gcc-cross-initial_4.3.1.bb
packages/mythtv/mythtv/configure.patch
packages/mythtv/mythtv_svn.bb
packages/vlc/vlc-davinci_0.8.6h.bb
Diffs:
#
# mt diff -raadc54707d1990050b64f5354702d6454308b093 -rde9ca24b1a6fcf987fbe230d064437535732d4f1
#
#
#
# rename "packages/openmoko-projects/illume-theme_svn.bb"
# to "packages/openmoko-projects/illume-theme-asu_svn.bb"
#
# add_file "packages/freesmartphone/illume-theme-freesmartphone_git.bb"
# content [74dd3d5b16c2639392c7ef886407ef20da006d74]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [a237638d389c64b3de893a3d3c8811cec9602c62]
# to [598b7ea3ddecc3a43f0d1e4b1d47cf8f3cb38ee2]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3f7f64ecffb3a08b7d6d6b1dcbb873b77c474243]
# to [4b304c71e110bbeef27f89dc40072ac231953996]
#
# patch "packages/images/fso-image.bb"
# from [47e485f1da984173ab5e4edfb1c4902bfe7582ec]
# to [8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2]
#
# patch "packages/openmoko-projects/illume-theme-asu_svn.bb"
# from [3062f9f6fca999155ef2d80cfba1df0c3becadba]
# to [df9b2f5c88a008cb413a42a4ab50fa2639e97cc2]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [a832f6689fb7f2bfda076fac8149931f17a55a87]
# to [39270f48f788723273ee3a1246361321db6608d4]
#
============================================================
--- packages/freesmartphone/illume-theme-freesmartphone_git.bb 74dd3d5b16c2639392c7ef886407ef20da006d74
+++ packages/freesmartphone/illume-theme-freesmartphone_git.bb 74dd3d5b16c2639392c7ef886407ef20da006d74
@@ -0,0 +1,27 @@
+DESCRIPTION = "Illume theme for the freesmartphone.org project"
+HOMEPAGE = "http://illume.projects.openmoko.org/"
+LICENSE = "MIT/BSD"
+PV = "0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/illume"
+
+do_install() {
+ install -d ${D}${sysconfdir}/enlightenment
+ install -d ${D}${datadir}/enlightenment/data/themes/
+ install -d ${D}${datadir}/enlightenment/data/init/
+
+ # Make illume the default profile
+ echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+
+ install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/
+ install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+}
+
+RPROVIDES_${PN} = "illume-theme"
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+PACKAGE_ARCH_${PN} = "all"
+
============================================================
--- conf/distro/include/fso-autorev.inc a237638d389c64b3de893a3d3c8811cec9602c62
+++ conf/distro/include/fso-autorev.inc 598b7ea3ddecc3a43f0d1e4b1d47cf8f3cb38ee2
@@ -1,6 +1,7 @@ SRCREV_pn-gsmd2 = "${AUTOREV}"
SRCREV_pn-frameworkd = "${AUTOREV}"
SRCREV_pn-gsm0710muxd = "${AUTOREV}"
SRCREV_pn-gsmd2 = "${AUTOREV}"
+SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
SRCREV_pn-pygsm = "${AUTOREV}"
SRCREV_pn-mickeydbus = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 3f7f64ecffb3a08b7d6d6b1dcbb873b77c474243
+++ conf/distro/include/sane-srcrevs.inc 4b304c71e110bbeef27f89dc40072ac231953996
@@ -49,7 +49,8 @@ SRCREV_pn-illume ?= "134"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-illume ?= "134"
-SRCREV_pn-illume-theme ?= "134"
+SRCREV_pn-illume-theme-asu ?= "134"
+SRCREV_pn-illume-theme-freesmartphone ?= "8128497ad1260202c6ebfb08c11a2253bf81665b"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
============================================================
--- packages/images/fso-image.bb 47e485f1da984173ab5e4edfb1c4902bfe7582ec
+++ packages/images/fso-image.bb 8e985d24c20f5264b0ec523fc3b8f7f1d938f8b2
@@ -20,7 +20,7 @@ X_INSTALL = "\
X_INSTALL = "\
e-wm \
illume \
- illume-theme \
+ illume-theme-freesmartphone \
${XSERVER} \
xserver-kdrive-common \
xserver-nodm-init \
============================================================
--- packages/openmoko-projects/illume-theme_svn.bb 3062f9f6fca999155ef2d80cfba1df0c3becadba
+++ packages/openmoko-projects/illume-theme-asu_svn.bb df9b2f5c88a008cb413a42a4ab50fa2639e97cc2
@@ -1,17 +1,12 @@ LICENSE = "MIT/BSD"
DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
HOMEPAGE = "http://illume.projects.openmoko.org/"
LICENSE = "MIT/BSD"
-
-PACKAGE_ARCH="all"
PV = "0.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=http"
S = "${WORKDIR}/illume"
-CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
-FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
-
do_install() {
install -d ${D}${sysconfdir}/enlightenment
install -d ${D}${datadir}/enlightenment/data/themes/
@@ -23,3 +18,10 @@ do_install() {
install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
}
+
+RPROVIDES_${PN} = "illume-theme"
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+PACKAGE_ARCH_${PN} = "all"
+
============================================================
--- packages/openmoko-projects/illume_svn.bb a832f6689fb7f2bfda076fac8149931f17a55a87
+++ packages/openmoko-projects/illume_svn.bb 39270f48f788723273ee3a1246361321db6608d4
@@ -4,7 +4,7 @@ PV = "0.0+svnr${SRCREV}"
LICENSE = "MIT/BSD"
DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
S = "${WORKDIR}/${PN}"
@@ -21,6 +21,7 @@ RRECOMMENDS_${PN} = "\
RRECOMMENDS_${PN} = "\
wamerican \
${PN}-config \
+ ${PN}-theme \
${PN}-dicts-default \
${PN}-keyboards-default \
${PN}-keyboards-numbers \
#
# mt diff -rd2cf665b4d3013caa5979709d44b24fb0f2a9812 -rde9ca24b1a6fcf987fbe230d064437535732d4f1
#
#
#
# add_dir "packages/qt4/qt4-x11-free-4.4.0"
#
# add_file "packages/dsplink/files/ticel-config"
# content [84cb94f0bdf0de83e7416a78d8d04d70018657c0]
#
# add_file "packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch"
# content [8e6d3785dd29dc45cdb795c6a4a1c70b3aa60300]
#
# add_file "packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch"
# content [2cbc3b136ee24e92a85a74d95f62c6efd87f7591]
#
# add_file "packages/mythtv/mythtv/ifdef-qt.diff"
# content [1371fe1b67002e5b8213ebd167adfd5ffa836d71]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch"
# content [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch"
# content [183a0e33f58672eca181e9db1ccfc989c3713628]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch"
# content [36b5d42de52855e6a1ad8b8858043fbef8ec9963]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch"
# content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch"
# content [e0202ec32ac08327d4432d53f000d1500072e47a]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch"
# content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch"
# content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch"
# content [c3b316fee55e5f2f5eecd54f37cdc88af92b9956]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/build-tools.patch"
# content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf"
# content [40e5550b5f9b6f0041674c58f49f96eb79c0076a]
#
# add_file "packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h"
# content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
#
# add_file "packages/qt4/qt4-x11-free_4.4.0.bb"
# content [cc8872a380445d2c8344bc46ac50b6ba36513594]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [4ad449722da462190549870fced8474d46c7eaf9]
# to [d83292d24c597cfd09dbf4e868d8c748469883cc]
#
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
# from [971ef47a559df916062205d456f82322c39df976]
# to [ac9527b9ee0c35149983f59fb0f3d92f5e62cbc2]
#
# patch "packages/freesmartphone/zhone_git.bb"
# from [a7c3f434ee7bee53eea765eab5e7cd972ac50362]
# to [8fa1e8460ec20dddd5abc039954ef884c69ef9f7]
#
# patch "packages/gcc/gcc-4.3.1.inc"
# from [c95319fe788a145ce0a5aecd6d6c270424e47e03]
# to [7ee3a1d24f6fe58cc59653a6e65c7e8bcc68a8a7]
#
# patch "packages/gcc/gcc-cross-initial_4.3.1.bb"
# from [4b22e8ec5d3911ce0553e074354f5ad218d7fce8]
# to [1aadd72b822c32000450e9ae18faceef0112a99a]
#
# patch "packages/mythtv/mythtv/configure.patch"
# from [02de2e41548d3bbaf743be687cd8a61f75f53b45]
# to [542f276e72e4a3c7ecfe9b3a7ed53407e3901868]
#
# patch "packages/mythtv/mythtv_svn.bb"
# from [280a95e7fa9c7ffb591b27800bdca538df0ea3fe]
# to [c099b322a994478a2804d178c62e390bd2465c4d]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [e0407866910d3d69a22836068a44abb248c767b9]
# to [89eeb1dfedcbed204a397ea4358d8fb53c581789]
#
============================================================
--- packages/dsplink/files/ticel-config 84cb94f0bdf0de83e7416a78d8d04d70018657c0
+++ packages/dsplink/files/ticel-config 84cb94f0bdf0de83e7416a78d8d04d70018657c0
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+LIBS=""
+for lib in \
+ decode_x470MV.a \
+ TraceUtil.a \
+ bioslog.a \
+ video.a \
+ audio.a \
+ speech.a \
+ ce.a \
+ Algorithm_noOS.a \
+ alg.a \
+ osal_dsplink_linux.a \
+ osal_dsplink_linux_6446.a \
+ dman3Cfg.a \
+ acpy3.a \
+ cmem.a \
+ dsplink.lib \
+ XdmUtils.a \
+ gt.a
+do
+ LIBS="${LIBS} SEDME_STAGINGLIBDIR/${lib}"
+done
+
+CFLAGS="SEDME_CFLAGS"
+
+usage()
+{
+ echo "Usage : $0 [--cflags] [--libs]"
+ exit 1
+}
+
+test "$#" = 0 && usage
+
+OUT=""
+while test "$#" -gt 0;
+do
+ case "$1" in
+ "--cflags")
+ OUT="${OUT} ${CFLAGS}"
+ ;;
+ "--libs")
+ OUT="${OUT} ${LIBDIRS} ${LIBS}"
+ ;;
+ *)
+ usage
+ ;;
+ esac
+
+ shift
+done
+
+echo "${OUT}"
+exit 0
============================================================
--- packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch 8e6d3785dd29dc45cdb795c6a4a1c70b3aa60300
+++ packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch 8e6d3785dd29dc45cdb795c6a4a1c70b3aa60300
@@ -0,0 +1,31 @@
+---
+ configure | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-4.3.1/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/configure.ac 2008-07-21 12:29:18.000000000 -0700
++++ gcc-4.3.1/configure.ac 2008-07-21 12:29:35.000000000 -0700
+@@ -2352,7 +2352,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
+Index: gcc-4.3.1/configure
+===================================================================
+--- gcc-4.3.1.orig/configure 2008-07-21 12:29:48.000000000 -0700
++++ gcc-4.3.1/configure 2008-07-21 12:29:59.000000000 -0700
+@@ -5841,7 +5841,7 @@ fi
+ # for target_alias and gcc doesn't manage it consistently.
+ target_configargs="--cache-file=./config.cache ${target_configargs}"
+
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+ *" newlib "*)
+ case " $target_configargs " in
============================================================
--- packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch 2cbc3b136ee24e92a85a74d95f62c6efd87f7591
+++ packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch 2cbc3b136ee24e92a85a74d95f62c6efd87f7591
@@ -0,0 +1,5466 @@
+Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
+
+This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
+
+Other changes I had to do include:
+
+- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
+
+- passing the right CFLAGS to configure scripts as exported environment variables
+
+I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
+
+Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
+
+Paolo
+
+2008-02-19 Paolo Bonzini <bonzini at gnu.org>
+
+ PR bootstrap/32009
+ PR bootstrap/32161
+
+ * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here.
+ * configure: Regenerate.
+
+ * Makefile.def: Define stage_libcflags for all bootstrap stages.
+ * Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS,
+ STAGE4_LIBCFLAGS): New.
+ (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without
+ $(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
+ (BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS.
+ (EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS.
+ (configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags
+ for target modules. Don't export LIBCFLAGS.
+ (all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass
+ $(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after
+ the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
+ (invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with
+ $(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS).
+ * Makefile.in: Regenerate.
+
+config:
+2008-02-19 Paolo Bonzini <bonzini at gnu.org>
+
+ PR bootstrap/32009
+ * mh-ppc-darwin (BOOT_CFLAGS): Reenable.
+
+gcc:
+2008-02-19 Paolo Bonzini <bonzini at gnu.org>
+
+ PR bootstrap/32009
+ * doc/install.texi: Correct references to CFLAGS, replacing them
+ with BOOT_CFLAGS. Document flags used during bootstrap for
+ target libraries.
+
+
+---
+ Makefile.def | 24
+ Makefile.in | 1802 +++++++++++++++++++++++++++++++--------------------
+ Makefile.tpl | 57 -
+ config/mh-ppc-darwin | 3
+ configure | 36 -
+ configure.ac | 32
+ gcc/doc/install.texi | 56 -
+ 7 files changed, 1261 insertions(+), 749 deletions(-)
+
+Index: gcc-4.3.1/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800
++++ gcc-4.3.1/configure.ac 2008-07-21 10:56:15.000000000 -0700
+@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map],
+ [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
+ AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
+
++# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
++# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
++# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
++# We want to ensure that TARGET libraries (which we know are built with
++# gcc) are built with "-O2 -g", so include those options when setting
++# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
++if test "x$CFLAGS_FOR_TARGET" = x; then
++ CFLAGS_FOR_TARGET=$CFLAGS
++ case " $CFLAGS " in
++ *" -O2 "*) ;;
++ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
++ esac
++ case " $CFLAGS " in
++ *" -g "* | *" -g3 "*) ;;
++ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
++ esac
++fi
++AC_SUBST(CFLAGS_FOR_TARGET)
++
++if test "x$CXXFLAGS_FOR_TARGET" = x; then
++ CXXFLAGS_FOR_TARGET=$CXXFLAGS
++ case " $CXXFLAGS " in
++ *" -O2 "*) ;;
++ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
++ esac
++ case " $CXXFLAGS " in
++ *" -g "* | *" -g3 "*) ;;
++ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
++ esac
++fi
++AC_SUBST(CXXFLAGS_FOR_TARGET)
++
+ # Handle --with-headers=XXX. If the value is not "yes", the contents of
+ # the named directory are copied to $(tooldir)/sys-include.
+ if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
+Index: gcc-4.3.1/Makefile.def
+===================================================================
+--- gcc-4.3.1.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700
++++ gcc-4.3.1/Makefile.def 2008-07-21 10:56:15.000000000 -0700
+@@ -511,43 +511,51 @@ bootstrap_stage = {
+ // compiler probably has never heard of them.
+ stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
+ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
+- stage_cflags='$(STAGE1_CFLAGS)' ; };
++ stage_cflags='$(STAGE1_CFLAGS)' ;
++ stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
+ bootstrap_stage = {
+ id=2 ; prev=1 ;
+ bootstrap_target=bootstrap2 ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags="$(STAGE2_CFLAGS)" ; };
++ stage_cflags="$(STAGE2_CFLAGS)" ;
++ stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
+ bootstrap_stage = {
+ id=b2g0 ; prev=1 ;
+ bootstrap_target=bootstrap2-debug ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
++ stage_cflags="$(STAGE2_CFLAGS) -g0" ;
++ stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
+ bootstrap_stage = {
+ id=3 ; prev=2 ; lean=1 ;
+ compare_target=compare ;
+ bootstrap_target=bootstrap ;
+ cleanstrap_target=cleanstrap ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags="$(STAGE3_CFLAGS)" ; };
++ stage_cflags="$(STAGE3_CFLAGS)" ;
++ stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
+ bootstrap_stage = {
+ id=b3g2 ; prev=b2g0 ; lean=1 ;
+ compare_target=compare-debug ;
+ bootstrap_target=bootstrap-debug ;
+ cleanstrap_target=cleanstrap-debug ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
++ stage_cflags="$(STAGE3_CFLAGS) -g2" ;
++ stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
+ bootstrap_stage = {
+ id=4 ; prev=3 ; lean=2 ;
+ compare_target=compare3 ;
+ bootstrap_target=bootstrap4 ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags="$(STAGE4_CFLAGS)" ; };
++ stage_cflags="$(STAGE4_CFLAGS)" ;
++ stage_libcflags="$(STAGE4_CFLAGS)" ; };
+ bootstrap_stage = {
+ id=profile ; prev=1 ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
++ stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
++ stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
+ bootstrap_stage = {
+ id=feedback ; prev=profile ;
+ bootstrap_target=profiledbootstrap ;
+ stage_configure_flags="@stage2_werror_flag@" ;
+- stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
++ stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
++ stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
+Index: gcc-4.3.1/Makefile.tpl
+===================================================================
+--- gcc-4.3.1.orig/Makefile.tpl 2008-07-21 10:56:14.000000000 -0700
++++ gcc-4.3.1/Makefile.tpl 2008-07-21 10:56:15.000000000 -0700
+@@ -207,10 +207,10 @@ BASE_TARGET_EXPORTS = \
+ AR="$(AR_FOR_TARGET)"; export AR; \
+ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ CC="$(CC_FOR_TARGET)"; export CC; \
+- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
++ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
++ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
+ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
+ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
+@@ -330,14 +330,19 @@ PICFLAG =
+ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+ # overrideable (for a bootstrap build stage1 also builds gcc.info).
+
+-STAGE1_CFLAGS=@stage1_cflags@
+ STAGE1_CHECKING=@stage1_checking@
+ STAGE1_LANGUAGES=@stage1_languages@
+
++STAGE1_CFLAGS=@stage1_cflags@
+ STAGE2_CFLAGS=$(BOOT_CFLAGS)
+ STAGE3_CFLAGS=$(BOOT_CFLAGS)
+ STAGE4_CFLAGS=$(BOOT_CFLAGS)
+
++STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
++
+ do-compare = @do_compare@
+ do-compare3 = $(do-compare)
+ do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
+@@ -376,18 +381,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
+ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
+ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
+
+-# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
+-# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
+-# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
+-# We want to ensure that TARGET libraries (which we know are built with
+-# gcc) are built with "-O2 -g", so prepend those options when setting
+-# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
+-CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
+- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
++CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
++CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
+ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
+ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
+-CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
+- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
++
+ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
+ LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
+ LDFLAGS_FOR_TARGET = @LDFLAGS@
+@@ -491,19 +489,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
+ # Flags to pass down to makes which are built with the target environment.
+ # The double $ decreases the length of the command line; those variables
+ # are set in BASE_FLAGS_TO_PAS%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list