[oe-commits] org.oe.dev merge of '7c0a885daa3893962bf21628fe340b191ecb0259'

mickeyl commit openembedded-commits at lists.openembedded.org
Mon Feb 18 15:34:52 UTC 2008


merge of '7c0a885daa3893962bf21628fe340b191ecb0259'
     and 'fdb543591628f771630c9bdf28e86d3e0911be03'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 99b227affc1ba6022c22fdb20be88403d0e5ecff
ViewMTN: http://monotone.openembedded.org/revision/info/99b227affc1ba6022c22fdb20be88403d0e5ecff
Files:
1
packages/acpid/acpid-1.0.3
packages/acpid/acpid-1.0.3/gcc40.patch
packages/sqlite/sqlite3-3.2.2/libtool.patch
packages/sqlite/sqlite3-3.2.5/libtool.patch
packages/sqlite/sqlite3-3.2.7/libtool.patch
packages/sqlite/sqlite3-3.3.12/cross-compile.patch
packages/sqlite/sqlite3-3.3.12/libtool.patch
packages/sqlite/sqlite3-3.3.13/cross-compile.patch
packages/sqlite/sqlite3-3.3.13/libtool.patch
packages/sqlite/sqlite3-3.3.17/libtool.patch
packages/sqlite/sqlite3-3.4.1/libtool.patch
packages/wxbase
packages/acpid/acpid-1.0.4
packages/acpid/acpid
packages/djvulibre/djvulibre_3.5.19.bb
packages/djvulibre/djvulibre_3.5.20.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop.inc
packages/gnome/gnome-doc-utils_0.12.0.bb
packages/gnome/gnome-doc-utils.inc
packages/qclockchange/qclockchange_0.1a.bb
packages/qclockchange/qclockchange_0.1b.bb
packages/sqlite/sqlite3_3.5.2.bb
packages/sqlite/sqlite3_3.5.6.bb
packages/wxbase/wxbase_2.6.2.bb
packages/wxwidgets/wxbase_2.6.2.bb
packages/wxbase/wxbase_2.7+cvs.bb
packages/wxwidgets/wxbase_2.7+cvs.bb
packages/amule
packages/amule/files
packages/qclockchange/files
packages/amule/amule_2.1.3.bb
packages/amule/files/parser.patch
packages/qclockchange/files/qclockchange.desktop
packages/qclockchange/files/qclockchange.png
packages/wireshark/tshark_0.99.4.bb
conf/machine/include/zaurus-2.6.inc
packages/acpid/acpid/gcc40.patch
packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch
packages/glibc/glibc-2.4/zecke-sane-readelf.patch
packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.7.90.bb
packages/gnome/gnome-doc-utils_0.10.3.bb
packages/gnome/gnome-doc-utils_0.7.1.bb
packages/gtk-webcore/osb-nrcore.inc
packages/icewm/icewm_1.2.20.bb
packages/icewm/icewm_1.2.30.bb
packages/libmrss/files/better-parse-url-r0.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-rp-2.6.24/pxafb.patch
packages/linux/linux_2.6.23.bb
packages/tasks/task-base.bb
packages/tasks/task-opie-all.bb
packages/xorg-proto/renderproto_0.9.3.bb
mtn:manual_merge
true
conf/distro/include/preferred-om-2008-versions.inc
Diffs:

#
# mt diff -r7c0a885daa3893962bf21628fe340b191ecb0259 -r99b227affc1ba6022c22fdb20be88403d0e5ecff
#
# 
# 
# delete "packages/acpid/acpid-1.0.3"
# 
# delete "packages/acpid/acpid-1.0.3/gcc40.patch"
# 
# delete "packages/sqlite/sqlite3-3.2.2/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.2.5/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.2.7/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.3.12/cross-compile.patch"
# 
# delete "packages/sqlite/sqlite3-3.3.12/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.3.13/cross-compile.patch"
# 
# delete "packages/sqlite/sqlite3-3.3.13/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.3.17/libtool.patch"
# 
# delete "packages/sqlite/sqlite3-3.4.1/libtool.patch"
# 
# delete "packages/wxbase"
# 
# rename "packages/acpid/acpid-1.0.4"
#     to "packages/acpid/acpid"
# 
# rename "packages/djvulibre/djvulibre_3.5.19.bb"
#     to "packages/djvulibre/djvulibre_3.5.20.bb"
# 
# rename "packages/gnome/gnome-desktop_2.18.3.bb"
#     to "packages/gnome/gnome-desktop.inc"
# 
# rename "packages/gnome/gnome-doc-utils_0.12.0.bb"
#     to "packages/gnome/gnome-doc-utils.inc"
# 
# rename "packages/qclockchange/qclockchange_0.1a.bb"
#     to "packages/qclockchange/qclockchange_0.1b.bb"
# 
# rename "packages/sqlite/sqlite3_3.5.2.bb"
#     to "packages/sqlite/sqlite3_3.5.6.bb"
# 
# rename "packages/wxbase/wxbase_2.6.2.bb"
#     to "packages/wxwidgets/wxbase_2.6.2.bb"
# 
# rename "packages/wxbase/wxbase_2.7+cvs.bb"
#     to "packages/wxwidgets/wxbase_2.7+cvs.bb"
# 
# add_dir "packages/amule"
# 
# add_dir "packages/amule/files"
# 
# add_dir "packages/qclockchange/files"
# 
# add_file "packages/amule/amule_2.1.3.bb"
#  content [e94b17ff6a0526951854c033da5fe53b89be7198]
# 
# add_file "packages/amule/files/parser.patch"
#  content [aa35fa9621c341aaf36abdc4f0a42887e4e6e384]
# 
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
#  content [6079856c781ba60fdff12f64b4d1588ca08852a5]
# 
# add_file "packages/gnome/gnome-doc-utils_0.12.0.bb"
#  content [a19715799f019c23ef02f4de5acf3c726bec8650]
# 
# add_file "packages/qclockchange/files/qclockchange.desktop"
#  content [dd18cef1ed03f54eced000fbd7443d98bba85a15]
# 
# add_file "packages/qclockchange/files/qclockchange.png"
#  content [73367d739fe256beff7ab2dd31953eb14bdfdeab]
# 
# add_file "packages/wireshark/tshark_0.99.4.bb"
#  content [4b37a9286676af526c662a32c4c6ad0a42072b44]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [39d33e732bf59736015329814890e175fef292aa]
#    to [28f9350146ad28dc16ffd19ca0f09a93374826cb]
# 
# patch "packages/acpid/acpid/gcc40.patch"
#  from [cf30b18ca31b7673bb4d0ab17cbc878a85931824]
#    to [35d3c4c5e9be1ba04272e75faafb2e8f72c1ade0]
# 
# patch "packages/djvulibre/djvulibre_3.5.20.bb"
#  from [31780467586c24a7eb4054b32db0e117544ef4e0]
#    to [827101405780029d53ee9eedf270321d2478d5ad]
# 
# patch "packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch"
#  from [6148ea439041ba0af321d2298fea9a6d602f585e]
#    to [3df45360067c99ecdec52e388d544e6bd01f5efd]
# 
# patch "packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch"
#  from [6148ea439041ba0af321d2298fea9a6d602f585e]
#    to [3df45360067c99ecdec52e388d544e6bd01f5efd]
# 
# patch "packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch"
#  from [6e9d8445c31e423d84214b7b5560ebd144b1fb51]
#    to [0078a4cb532f5bbf3ac56c8b4ccd752667e2ebb7]
# 
# patch "packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch"
#  from [6148ea439041ba0af321d2298fea9a6d602f585e]
#    to [3df45360067c99ecdec52e388d544e6bd01f5efd]
# 
# patch "packages/gcc/gcc-4.2.2/zecke-xgcc-cpp.patch"
#  from [6148ea439041ba0af321d2298fea9a6d602f585e]
#    to [3df45360067c99ecdec52e388d544e6bd01f5efd]
# 
# patch "packages/glibc/glibc-2.4/zecke-sane-readelf.patch"
#  from [1bf40ba5b96f9f1b55bfc59a01c270ca3d3ba229]
#    to [1aedabaa230e8af859575e07484944f4b135b283]
# 
# patch "packages/glibc/glibc-cvs-2.3.5/zecke-sane-readelf.patch"
#  from [83b1a8059735512cca0723c69deefedefe53ae34]
#    to [dddc4f563edeb427c1e1fa4846f3f4a6fc4d954f]
# 
# patch "packages/gnome/gnome-desktop.inc"
#  from [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
#    to [ae7d1f621863cadbef05eb1f7f7f0ff5238b949f]
# 
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
#  from [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
#    to [ea2004e40d21245dbc62c44f4224bc622966d11d]
# 
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
#  from [565cba914027dd074428c1510c94057850e452ca]
#    to [26b93ff26ce2ebe90d9da2d9e73875c725298e3f]
# 
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
#  from [672cf3775b27ea7c0ca4479a528992bf28309f93]
#    to [306e90595f3048833eace7255a0575e0ff9bd465]
# 
# patch "packages/gnome/gnome-doc-utils.inc"
#  from [20041d84ef0cc9aeae12802d43820966a313b667]
#    to [c8e230031563a67eea32291c7e49e7e13ea71bb7]
# 
# patch "packages/gnome/gnome-doc-utils_0.10.3.bb"
#  from [769f90e66d1d2edcc7554bb98f763f4c6fcc1a1d]
#    to [5e65c0d1c85e79f4a5aee77aeaa4e5434b746c83]
# 
# patch "packages/gnome/gnome-doc-utils_0.7.1.bb"
#  from [95ce2c16e2b48e5150f7697d34e97d40b964dad9]
#    to [a19715799f019c23ef02f4de5acf3c726bec8650]
# 
# patch "packages/gtk-webcore/osb-nrcore.inc"
#  from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
#    to [14b28a3540c2fd2e0aff8ac709b81699cf3cc3e5]
# 
# patch "packages/icewm/icewm_1.2.20.bb"
#  from [0a027303c29416712c81e2ca8184eca58c4b12bb]
#    to [12b5608a153a95d3d909b54fd317f078ed8eca48]
# 
# patch "packages/icewm/icewm_1.2.30.bb"
#  from [f7b7e77c36d0b7c8aeb429d0d3612d4d700b6be6]
#    to [1afb403a34441aa9e4586f80e8bd2a29028cf9a4]
# 
# patch "packages/libmrss/files/better-parse-url-r0.patch"
#  from [319f2b0b847d67bbab8f062cfd8d5d99c55d4eed]
#    to [42f3491db88f08e1d935154095c1970fddf9a538]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
#  from [31fbac69083a743610a7b45b209c1eedf231ea8f]
#    to [226e96adfe6504d2b1c198a787fe70f46c3a0b67]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [f9f0f5550a035d11532343bcf6adeddd9141aacb]
#    to [ec0ab967eff58b5d646241e714a9e0f0ee02b8fa]
# 
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
#    to [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
# 
# patch "packages/linux/linux-rp-2.6.24/pxafb.patch"
#  from [d67eb27feca26ea83424f3eebfe5fd89f5e3b75f]
#    to [f885ab91c336e3345ebcc06ff37f90b630dca0d1]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [d0076453dce6a15a60ac441aaedca4b4d35b86da]
#    to [a9d28d2fb58ab00bc0024eb2dc819228bbe6d7ea]
# 
# patch "packages/qclockchange/qclockchange_0.1b.bb"
#  from [454f95d346a5672cd49d48db50e7ef5e74a78805]
#    to [c6c230d3f270ff79f9f0763863be3b943720b3d2]
# 
# patch "packages/tasks/task-base.bb"
#  from [461108bf3685f7346e95114839d03eebb184593b]
#    to [0cd29b3c066d3479d8e51bf7737d5674bec79deb]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
#    to [15c14539dc8f8cae41b6fac4fa108dce9012a130]
# 
# patch "packages/xorg-proto/renderproto_0.9.3.bb"
#  from [1bb8221a34173072ea7c764733f75f2a635ff066]
#    to [941a64141dc39736fe734344c9ecc6cbbb9620f4]
# 
#   set "packages/qclockchange/files/qclockchange.png"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
+++ packages/amule/amule_2.1.3.bb	e94b17ff6a0526951854c033da5fe53b89be7198
@@ -0,0 +1,25 @@
+DESCRIPTION = "aMule is an eMule-like client for the eD2k \
+and Kademlia networks, supporting multiple platforms."
+HOMEPAGE = "http://www.amule.org"
+LICENSE = "GPL"
+SECTION = "web"
+PRIORITY = "optional"
+DEPENDS = "wxbase"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/amule/aMule-${PV}.tar.bz2 \
+           file://parser.patch;patch=1"
+
+S = "${WORKDIR}/aMule-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-amulecmd \
+                --enable-webserver \
+		--disable-monolithic \
+		--enable-amule-daemon \
+		--disable-nls"
+#		--enable-optimize"
+
+FILES_${PN} += " \
+        ${libdir}/xchat"
============================================================
--- packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
+++ packages/amule/files/parser.patch	aa35fa9621c341aaf36abdc4f0a42887e4e6e384
@@ -0,0 +1,20 @@
+diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp
+--- aMule-2.1.0_orig/src/Parser.cpp	2005-12-20 05:13:25.000000000 +0100
++++ aMule-2.1.0/src/Parser.cpp	2006-01-29 15:16:45.000000000 +0100
+@@ -203,14 +203,14 @@
+ #   define YYMALLOC malloc
+ #   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifndef YYFREE
+ #   define YYFREE free
+ #   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+-void free (void *); /* INFRINGES ON USER NAME SPACE */
++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifdef __cplusplus
============================================================
--- packages/gnome/gnome-desktop_2.18.3.bb	6079856c781ba60fdff12f64b4d1588ca08852a5
+++ packages/gnome/gnome-desktop_2.18.3.bb	6079856c781ba60fdff12f64b4d1588ca08852a5
@@ -0,0 +1,10 @@
+require gnome-desktop.inc
+
+PR = "r2"
+
+inherit gnome pkgconfig
+
+DEPENDS += "gnome-doc-utils gnome-vfs"
+
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+            file://no-desktop-docs.patch;patch=1;pnum=0"
============================================================
--- packages/gnome/gnome-doc-utils_0.12.0.bb	a19715799f019c23ef02f4de5acf3c726bec8650
+++ packages/gnome/gnome-doc-utils_0.12.0.bb	a19715799f019c23ef02f4de5acf3c726bec8650
@@ -0,0 +1,3 @@
+require gnome-doc-utils.inc
+
+PR = "r1"
============================================================
--- packages/qclockchange/files/qclockchange.desktop	dd18cef1ed03f54eced000fbd7443d98bba85a15
+++ packages/qclockchange/files/qclockchange.desktop	dd18cef1ed03f54eced000fbd7443d98bba85a15
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment= Changes the CPU frequency
+Exec=qclockchange
+Icon=qclockchange
+Type=Application
+Name=Qclockchange
============================================================
# packages/qclockchange/files/qclockchange.png is binary
============================================================
--- packages/wireshark/tshark_0.99.4.bb	4b37a9286676af526c662a32c4c6ad0a42072b44
+++ packages/wireshark/tshark_0.99.4.bb	4b37a9286676af526c662a32c4c6ad0a42072b44
@@ -0,0 +1,21 @@
+DESCRIPTION = "tshark is the text based verion of wireshark - a popular network protocol analyzer"
+HOMEPAGE = "http://www.ethereal.com"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "perl-native gnutls libpcap pcre expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \
+           file://use-our-lemon.patch;patch=1 \
+	   file://no-host-includes.patch;patch=1"
+
+S=${WORKDIR}/wireshark-${PV}
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-wireshark"
+
+do_compile_prepend() {
+	${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+	oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+}
+
============================================================
--- conf/machine/include/zaurus-2.6.inc	39d33e732bf59736015329814890e175fef292aa
+++ conf/machine/include/zaurus-2.6.inc	28f9350146ad28dc16ffd19ca0f09a93374826cb
@@ -31,7 +31,7 @@ MACHINE_EXTRA_RRECOMMENDS_spitz  = "kern
 MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
-MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle"
+MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
 	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd"
 
============================================================
--- packages/acpid/acpid/gcc40.patch	cf30b18ca31b7673bb4d0ab17cbc878a85931824
+++ packages/acpid/acpid/gcc40.patch	35d3c4c5e9be1ba04272e75faafb2e8f72c1ade0
@@ -1,3 +1,5 @@
+upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341
+
 Index: acpid-1.0.3/ud_socket.c
 ===================================================================
 --- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
============================================================
--- packages/djvulibre/djvulibre_3.5.19.bb	31780467586c24a7eb4054b32db0e117544ef4e0
+++ packages/djvulibre/djvulibre_3.5.20.bb	827101405780029d53ee9eedf270321d2478d5ad
@@ -1,27 +1,23 @@ LICENSE = "GPL"
 DESCRIPTION = "DjVuLibre is an open source (GPL'ed) implementation of DjVu, including viewers, browser plugins, decoders, simple encoders, and utilities."
 LICENSE = "GPL"
-
 DEPENDS = "jpeg libpng tiff"
+PR = "r1"
 
-SRC_URI = "http://downloads.sourceforge.net/djvu/djvulibre-${PV}.tar.gz \
+SRC_URI = "http://{SOURCEFORGE_MIRROR}/djvu/djvulibre-${PV}.tar.gz \
            file://fix-cross-configure.patch;patch=1"
 
-
 inherit qt4x11 autotools pkgconfig
 
 #export QT_LIBS = "${OE_QMAKE_LIBS_QT}"
 #export QT_CFLAGS = "${OE_QMAKE_CXXFLAGS} -I${QTDIR}/include/Qt/ "
 
 EXTRA_OECONF = " --enable-threads \
-                 --with-qt=${QTDIR} "
+                 --with-qt=${PAMLTOPDIR} "
 
-PACKAGES =+ "libdjvulibre"
-
-FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
-FILES_${PN} += "${datadir}/djvu"
-
 do_stage() {
         autotools_stage_all
 }
 
+PACKAGES =+ "libdjvulibre"
+FILES_libdjvulibre = "${libdir}/libdjvulibre.so.*"
+FILES_${PN} += "${datadir}/djvu"
-
============================================================
--- packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch	6148ea439041ba0af321d2298fea9a6d602f585e
+++ packages/gcc/gcc-4.1.1/zecke-xgcc-cpp.patch	3df45360067c99ecdec52e388d544e6bd01f5efd
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
============================================================
--- packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch	6148ea439041ba0af321d2298fea9a6d602f585e
+++ packages/gcc/gcc-4.1.2/zecke-xgcc-cpp.patch	3df45360067c99ecdec52e388d544e6bd01f5efd
@@ -1,3 +1,7 @@
+upstream: n/a
+comment: Use the preprocessor we have just compiled instead the one of
+the system. There might be incompabilities between us and them.
+
 Index: gcc-4.1.1/Makefile.in
 ===================================================================
 --- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
============================================================
--- packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch	6e9d8445c31e423d84214b7b5560ebd144b1fb51
+++ packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch	0078a4cb532f5bbf3ac56c8b4ccd752667e2ebb7
@@ -1,3 +1,16 @@
+upstream: n/a
+status: evil hack
+comment: Including host system headers when cross compiling can lead to weird
+issues, in the best case compile issues, in the worst case crashes. E.g. if you
+are building a uclibc system, you certainly do not want glibc headers or OSX libc
+headers to be picked up. To avoid that this patch is penetalizing certain common
+Linux/Unix host directories.
+
+To send the patch upstream the evil paths should be specified by
+a setting or command-line options. Until now this is a evil hack assuming
+certain host system paths. E.g. /usr/local/ and other common paths should be
+added.
+
 Index: gcc-4.0.2/gcc/c-incpath.c
 ===================================================================
 --- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
============================================================
--- packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch	6148ea439041ba0af321d2298fea9a6d602f585e
+++ packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch	3df45360067c99ecdec52e388d544e6bd01f5efd
@@ -1,3 +1,7 @@
+upstream: n/a
+com%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rfdb543591628f771630c9bdf28e86d3e0911be03 -r99b227affc1ba6022c22fdb20be88403d0e5ecff
#
# 
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
#    to [dd29a8bfa10a0d3f786220dee4b2c942deb59552]
# 
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
+++ conf/distro/include/preferred-om-2008-versions.inc	dd29a8bfa10a0d3f786220dee4b2c942deb59552
@@ -1,7 +1,7 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_dbus = "1.1.4"
 PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_libtool = "1.5.24"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"






More information about the Openembedded-commits mailing list