[oe-commits] org.oe.dev merge of '6fe43ab76c4fc12eb8d88adfd84e1aa260ca5d6f'

[ifaistos commit]

merge of '6fe43ab76c4fc12eb8d88adfd84e1aa260ca5d6f'
     and 'c77bda4ba3178abef09bacdc2fbf63fd225870ca'

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: a4b45f4907654ad330b95a10864d7f41447ae1f4
ViewMTN: http://monotone.openembedded.org/revision/info/a4b45f4907654ad330b95a10864d7f41447ae1f4
Files:
1
packages/gnome/libgnomecups_0.2.2.bb
packages/meta/slugos-packages.bb
packages/wv/wv_1.2.0.bb
conf/machine/include/tune-x86.inc
conf/machine/x86.conf
Diffs:

#
# mt diff -r6fe43ab76c4fc12eb8d88adfd84e1aa260ca5d6f -ra4b45f4907654ad330b95a10864d7f41447ae1f4
#
#
#
# patch "packages/gnome/libgnomecups_0.2.2.bb"
#  from [1e18b0c069eb97114d915039a5d4e0acffaa845c]
#    to [fcc1915e40dea30f0ee7712a6c1f3b198c47e8f2]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f72a5746db26eeb3651f9bc8be05f02450d39c48]
#    to [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
# 
# patch "packages/wv/wv_1.2.0.bb"
#  from [dd195b7fef9868817a0197412faacfbc5978e525]
#    to [6c83952d5cd537068999ca340f7e8e9135646cbd]
#
============================================================
--- packages/gnome/libgnomecups_0.2.2.bb	1e18b0c069eb97114d915039a5d4e0acffaa845c
+++ packages/gnome/libgnomecups_0.2.2.bb	fcc1915e40dea30f0ee7712a6c1f3b198c47e8f2
@@ -6,6 +6,11 @@ inherit gnome pkgconfig
 
 inherit gnome pkgconfig
 
+do_compile_append () {
+	cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old
+	sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
+}
+
 do_stage() {
 autotools_stage_all
 }
============================================================
--- packages/meta/slugos-packages.bb	f72a5746db26eeb3651f9bc8be05f02450d39c48
+++ packages/meta/slugos-packages.bb	a8de050f9b9bde46ec2fe91cdf9d93c69da445cb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r49"
+PR = "r50"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -208,6 +208,7 @@ SLUGOS_PACKAGES = "\
 	smartmontools \
 	spandsp \
 	sqlite \
+	squid \
 	ssmtp \
 	strace \
 	streamripper \
============================================================
--- packages/wv/wv_1.2.0.bb	dd195b7fef9868817a0197412faacfbc5978e525
+++ packages/wv/wv_1.2.0.bb	6c83952d5cd537068999ca340f7e8e9135646cbd
@@ -12,6 +12,11 @@ EXTRA_OECONF = ""
 
 EXTRA_OECONF = ""
 
+do_compile_append () {
+	cp wv-1.0.pc wv-1.0.pc.old
+	sed 's:${STAGING_DIR_HOST}::g' < wv-1.0.pc.old > wv-1.0.pc
+}
+
 do_stage () {
 	autotools_stage_all
 }


#
# mt diff -rc77bda4ba3178abef09bacdc2fbf63fd225870ca -ra4b45f4907654ad330b95a10864d7f41447ae1f4
#
#
#
# add_file "conf/machine/include/tune-x86.inc"
#  content [6df546996c08b7962ed5c2698180a4846a70cda9]
# 
# patch "conf/machine/x86.conf"
#  from [96a9c14683b22db4b60943164fface49cc11e869]
#    to [5309d246381ff3e42c6ced3d4aa2fc56deb4eb9b]
#
============================================================
--- conf/machine/include/tune-x86.inc	6df546996c08b7962ed5c2698180a4846a70cda9
+++ conf/machine/include/tune-x86.inc	6df546996c08b7962ed5c2698180a4846a70cda9
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=i486"
+
+
============================================================
--- conf/machine/x86.conf	96a9c14683b22db4b60943164fface49cc11e869
+++ conf/machine/x86.conf	5309d246381ff3e42c6ced3d4aa2fc56deb4eb9b
@@ -22,4 +22,4 @@ GLIBC_EXTRA_OECONF = "--with-tls"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
+require conf/machine/include/tune-x86.inc
-#require conf/machine/include/tune-x86.inc