summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-23 09:04:43 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-23 09:04:43 +0000
commite91a812ac4a6b1dd9d3cd9aef1f87c33deaa5085 (patch)
tree2d25e5b146af7a9c049ed63a5f34f4c0d4f086a8
parent197bd064d5e8e08e8d3112a7765d5147da1b3e3a (diff)
parent1b93a70cb2f9d93d3344f779a5d0a0c241d243e1 (diff)
merge of '6e562962e9bd825d825465d312524f84e3e493a4'
and 'b0881da09ca99de633f27df620ac1f8e8250f288'
-rw-r--r--packages/avahi/avahi.inc3
-rw-r--r--packages/avahi/avahi_0.6.19.bb2
-rw-r--r--packages/avahi/avahi_0.6.20.bb2
-rw-r--r--packages/avahi/avahi_0.6.21.bb2
-rw-r--r--packages/avahi/avahi_0.6.22.bb2
5 files changed, 5 insertions, 6 deletions
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index e856e40db5..268a24faba 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -20,8 +20,7 @@ inherit autotools pkgconfig update-rc.d
RDEPENDS_append = ""
# TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
-EXTRA_OECONF_append_mipsel = " --disable-stack-protector"
+EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 631d4080fd..51786f6da7 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,3 @@
require avahi.inc
-PR = "r6"
+PR = "r7"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 631d4080fd..51786f6da7 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,3 @@
require avahi.inc
-PR = "r6"
+PR = "r7"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index 702594fa6e..6e4fa306c3 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
require avahi.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
diff --git a/packages/avahi/avahi_0.6.22.bb b/packages/avahi/avahi_0.6.22.bb
index d4f15f6199..b37cdfe18d 100644
--- a/packages/avahi/avahi_0.6.22.bb
+++ b/packages/avahi/avahi_0.6.22.bb
@@ -1,6 +1,6 @@
require avahi.inc
DEPENDS += "intltool-native"
-PR = "r6"
+PR = "r7"
PACKAGES =+ "libavahi-gobject"