[oe-commits] org.oe.dev merge of '832167cf1cc0ab655072532b7c546a8a25821e44'
jluebbe commit
oe at amethyst.openembedded.net
Tue Jul 22 15:54:54 UTC 2008
merge of '832167cf1cc0ab655072532b7c546a8a25821e44'
and 'e4aab546c3b33577e2fb6bcfe199da5a98b4a9a3'
Author: jluebbe at openembedded.org
Branch: org.openembedded.dev
Revision: 806e3f07f060ec38e52b0328840c81fc0f06b90c
ViewMTN: http://monotone.openembedded.org/revision/info/806e3f07f060ec38e52b0328840c81fc0f06b90c
Files:
1
packages/openmoko-projects/illume
packages/openmoko-projects/tangogps
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/iscsi-target
packages/iscsi-target/files
packages/mythtv/mythtv
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/iscsi-target/files/ietd.conf
packages/iscsi-target/files/init
packages/iscsi-target/files/libs.patch
packages/iscsi-target/iscsi-target_0.4.16.bb
packages/iscsi-target/iscsi-target_svn.bb
packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
packages/linux/linux-openmoko/defconfig-oe
packages/linux/linux-openmoko-devel/0001-squashfs-with-lzma.patch
packages/linux/linux-openmoko-devel/0002-squashfs-initrd.patch
packages/linux/linux-openmoko-devel/0003-squashfs-force-O2.patch
packages/linux/linux-openmoko-devel/0004-squashfs-Kconfig.patch
packages/linux/linux-openmoko-devel/0005-squashfs-Makefile.patch
packages/mythtv/mythtv/configure.patch
packages/mythtv/mythtv_0.21.bb
packages/mythtv/mythtv_svn.bb
conf/machine/neuros-osd2.conf
contrib/python/generate-manifest-2.5.py
packages/busybox/busybox_1.11.1.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/freesmartphone/frameworkd_git.bb
packages/gcc/gcc-4.3.1.inc
packages/gcc/gcc-cross-initial_4.3.1.bb
packages/linux/linux-neuros_git.bb
packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch
packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch
packages/linux/linux-omap2_git.bb
packages/linux/linux-openmoko-devel/defconfig-oe
packages/linux/linux-openmoko-devel_git.bb
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.24+git.bb
packages/mythtv/mythtv.inc
packages/openmoko-projects/illume_svn.bb
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/vlc/vlc-davinci_0.8.6h.bb
packages/freesmartphone/zhone_git.bb
Diffs:
#
# mt diff -r832167cf1cc0ab655072532b7c546a8a25821e44 -r806e3f07f060ec38e52b0328840c81fc0f06b90c
#
#
#
# delete "packages/openmoko-projects/illume"
#
# delete "packages/openmoko-projects/tangogps"
#
# delete "packages/openmoko-projects/tangogps/global-config-h.patch"
#
# delete "packages/openmoko-projects/tangogps_0.7.bb"
#
# add_dir "packages/iscsi-target"
#
# add_dir "packages/iscsi-target/files"
#
# add_dir "packages/mythtv/mythtv"
#
# 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/iscsi-target/files/ietd.conf"
# content [482017042fde4f6bbf3ad43f1e451c0d27a03f79]
#
# add_file "packages/iscsi-target/files/init"
# content [a14fa377d1df7ff8a2872ecb69723ba820253a3e]
#
# add_file "packages/iscsi-target/files/libs.patch"
# content [4aa33e1259bd175ff5a59ebd5190c7d1d09f2afd]
#
# add_file "packages/iscsi-target/iscsi-target_0.4.16.bb"
# content [4fee2645dd9baa27c488e53b1dd4867b4f6390bb]
#
# add_file "packages/iscsi-target/iscsi-target_svn.bb"
# content [d5fef34c3f39efd3c8fac839013fd4f6d7e70afa]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff"
# content [05766144d6796d91cb3a002e2a3c75ce6a1b1d7d]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff"
# content [016a4086941bdeb321b7ce106b8f205a88b4e6af]
#
# add_file "packages/linux/linux-openmoko/defconfig-oe"
# content [fc7f74fc37b72489472d00a1ba1c61908ba422fe]
#
# add_file "packages/linux/linux-openmoko-devel/0001-squashfs-with-lzma.patch"
# content [615a72f75ddcbe19b724e551f29efadaa9a1d6c4]
#
# add_file "packages/linux/linux-openmoko-devel/0002-squashfs-initrd.patch"
# content [bc477fb6004fa8815918368cb1367f2c33da20d3]
#
# add_file "packages/linux/linux-openmoko-devel/0003-squashfs-force-O2.patch"
# content [928791e59e2f9549f68f198ef02187e705d039de]
#
# add_file "packages/linux/linux-openmoko-devel/0004-squashfs-Kconfig.patch"
# content [8ae711e5bf3efdbfea6301c0d2cc5d5e93245c90]
#
# add_file "packages/linux/linux-openmoko-devel/0005-squashfs-Makefile.patch"
# content [4df295cc249ba19ed90eb047f1c04edc3833c142]
#
# add_file "packages/mythtv/mythtv/configure.patch"
# content [02de2e41548d3bbaf743be687cd8a61f75f53b45]
#
# add_file "packages/mythtv/mythtv_0.21.bb"
# content [f29d4a96714e9f178504e26dc9f419a4b3f33db5]
#
# add_file "packages/mythtv/mythtv_svn.bb"
# content [280a95e7fa9c7ffb591b27800bdca538df0ea3fe]
#
# patch "conf/machine/neuros-osd2.conf"
# from [fee48b7231afdc08a0a60696b81a0c4c00b25ade]
# to [e53737e49eb8880c1643d31fbfb73cc769ec96b2]
#
# patch "contrib/python/generate-manifest-2.5.py"
# from [d25d1af104394a98b32f686bf43876267201ffd8]
# to [2e26fcfbc5c7ad0ce9f3e92a66689a2cf74cc2b4]
#
# patch "packages/busybox/busybox_1.11.1.bb"
# from [202e50a9a6bbb8dbe187ede9fb3cff3ca02e9ed5]
# to [e55447ddfd5f9bcfbaa83e05a77b4079037f4649]
#
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
# from [0063cf4a9fd38f4a0da6489370bfd6820b3943ca]
# to [971ef47a559df916062205d456f82322c39df976]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [15a3b887f127384bdbff89c3ca2e0a3b4441274f]
# to [d7bc43957414c34d3f5aac03b45f32b0b23d6d86]
#
# 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/linux/linux-neuros_git.bb"
# from [43e12e797fab6b06d254ddbdef56e571229f1522]
# to [813bb26cde3a341c5e30d2248400314919213a19]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch"
# from [da576d5a0b54b0da52d31f95bc08b102a95ca3b2]
# to [6a99b66e76c84c87ab1e45c0985c879d94ac4438]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-02.patch"
# from [72af4f60c26f56679e95fc24ef3b7f5acabed0cf]
# to [e3286f230c7de114a1dc14e192a3d5fb80b022b3]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-03.patch"
# from [6284906123018747a79c7343545a7dd996b0ec39]
# to [34273fa2d5c071e18ac2f1197909967578e2126b]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-04.patch"
# from [656d89877fe629bfe6899289054c523bb7eb2e91]
# to [47336c0b4a7118b621d9068d065d0201488d3a04]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-05.patch"
# from [a89f99c1ea6b938b377f1ea97035e448fcbdb3b1]
# to [9d7d91c5387f06371065d98fc3632c2efe185142]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-06.patch"
# from [01cb8404a54532d68de3d2db4af14c4da5e5a109]
# to [e8d46bcc68305ac90e83b4f46d23d32adcdab421]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-07.patch"
# from [a280d8f500e253c8816899f5b34ce803e200faee]
# to [895c76bf663506910934a26ad8c6d73b5705ea3a]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-08.patch"
# from [d2d7e987a7124b50a4c43b41bbbb6b26c7e49e0b]
# to [efca04cf74065a39ac2b695ab2934b6a9740530f]
#
# patch "packages/linux/linux-omap2-git/beagleboard/TWL4030-09.patch"
# from [851122d7278bafa9d271aa4d3fdb81f61afeae01]
# to [fd71a971dae7541610ffbe920df2edbf747ee0b5]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [824775d9f3efae0925325c500da99a9741527658]
# to [43ac6aa586b248d87d01286575371b1800bb3d2a]
#
# patch "packages/linux/linux-openmoko-devel/defconfig-oe"
# from [ae215bbbd3ec8aef67ee264a2c5037e23e5cc743]
# to [fc7f74fc37b72489472d00a1ba1c61908ba422fe]
#
# patch "packages/linux/linux-openmoko-devel_git.bb"
# from [9a21ddc614d014bdc54366bd1abd41b077008279]
# to [ef150535060901a1c2b0ae2871688c62ad25e669]
#
# patch "packages/linux/linux-openmoko.inc"
# from [777a8e257ca20eaa4dce93b025330219707a5f9a]
# to [d0d5a324f355c7fe27eb595ec61b2d6c790e7ead]
#
# patch "packages/linux/linux-openmoko_2.6.24+git.bb"
# from [40d4bf72ce56c9c6b3ded3ccadd12799606cbf26]
# to [e6ec9a1830771f17bf656ca1e37377171476a2b8]
#
# patch "packages/mythtv/mythtv.inc"
# from [8018345c29d1b148d50191a1778ff38d9acf1886]
# to [bd289f60d1d68db7a6efc671001e68bcc3caee57]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [41cb95294e1a667cc99602223ca04eb2f2fe895a]
# to [a832f6689fb7f2bfda076fac8149931f17a55a87]
#
# patch "packages/tasks/task-base.bb"
# from [7a415eba1e3b66456e05cc2930cb45e8f94cc7fc]
# to [dbf6b2fb6b546996379743d91f02f085e4be575f]
#
# patch "packages/tasks/task-boot.bb"
# from [f2c84552aa3961a5c659902a79d3519d7d8fc38a]
# to [8aaef33d79d6086e7ccd51b8ba28faeaeb63d006]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [8465c3bdb7a97b4914aae65bd4e9c888e63297d5]
# to [e0407866910d3d69a22836068a44abb248c767b9]
#
============================================================
--- 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 CON%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re4aab546c3b33577e2fb6bcfe199da5a98b4a9a3 -r806e3f07f060ec38e52b0328840c81fc0f06b90c
#
#
#
# patch "packages/freesmartphone/zhone_git.bb"
# from [a7c3f434ee7bee53eea765eab5e7cd972ac50362]
# to [8fa1e8460ec20dddd5abc039954ef884c69ef9f7]
#
============================================================
--- packages/freesmartphone/zhone_git.bb a7c3f434ee7bee53eea765eab5e7cd972ac50362
+++ packages/freesmartphone/zhone_git.bb 8fa1e8460ec20dddd5abc039954ef884c69ef9f7
@@ -2,9 +2,9 @@ DEPENDS = "edje-native python-pyrex-nati
LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "edje-native python-pyrex-native python-cython-native"
-RDEPENDS = "task-python-efl python-textutils python-dbus"
+RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
PV = "0.0.0+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
file://80zhone"
More information about the Openembedded-commits
mailing list