[oe-commits] org.oe.dev merge of '30d4ffe61f8be818a3284fcd72f5e65697855083'

[rpurdie commit]

merge of '30d4ffe61f8be818a3284fcd72f5e65697855083'
     and '871de5bd63d5f7181059bcc581e6f21a7d547242'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: ac1396681a39aa837975627d5f2c4b2b31275af8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ac1396681a39aa837975627d5f2c4b2b31275af8
Files:
1
conf/bitbake.conf
packages/synergy/synergy_1.3.1.bb
Diffs:

#
# mt diff -r30d4ffe61f8be818a3284fcd72f5e65697855083 -rac1396681a39aa837975627d5f2c4b2b31275af8
#
# 
# 
# patch "conf/bitbake.conf"
#  from [1a40a8a4b4660be43379de36b41dceabe1bebd19]
#    to [65c6664182f52edf3011a54f0b1b6d85f137b7da]
# 
============================================================
--- conf/bitbake.conf	1a40a8a4b4660be43379de36b41dceabe1bebd19
+++ conf/bitbake.conf	65c6664182f52edf3011a54f0b1b6d85f137b7da
@@ -462,6 +462,10 @@ IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
 IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
 
+# Forcefully set CACHE now so future changes to things like 
+# MACHINE don't change the path to the cache
+CACHE := "${CACHE}"
+
 ##################################################################
 # Magic Cookie for SANITY CHECK
 ##################################################################


#
# mt diff -r871de5bd63d5f7181059bcc581e6f21a7d547242 -rac1396681a39aa837975627d5f2c4b2b31275af8
#
# 
# 
# add_file "packages/synergy/synergy_1.3.1.bb"
#  content [860f8088a0473a57ace13cb733b57d532eac0148]
# 
============================================================
--- packages/synergy/synergy_1.3.1.bb	860f8088a0473a57ace13cb733b57d532eac0148
+++ packages/synergy/synergy_1.3.1.bb	860f8088a0473a57ace13cb733b57d532eac0148
@@ -0,0 +1,15 @@
+DESCRIPTION = "Synergy - control multiple computers with one keyboard and mouse"
+HOMEPAGE = "http://synergy2.sourceforge.net/"
+LICENSE = "GPLv2"
+SECTION = "x11/utils"
+# NOTE: This depends on full x11, not diet-x11
+DEPENDS = "libx11 libxtst"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz"
+
+do_configure_prepend() {
+	grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::'
+}
+
+inherit autotools