avahi: Fix build for uclibcspe targets and use INC_PR

Signed-off-by: Khem Raj <raj.khem@gmail.com>

12 files changed, 13 insertions, 18 deletions

diff --git a/recipes/avahi/avahi-python_0.6.21.bb b/recipes/avahi/avahi-python_0.6.21.bb
index 982f69164c..f9b2ce41bc 100644
--- a/recipes/avahi/avahi-python_0.6.21.bb
+++ b/recipes/avahi/avahi-python_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r8"
+PR = "${INC_PR}.0"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""
diff --git a/recipes/avahi/avahi-python_0.6.25.bb b/recipes/avahi/avahi-python_0.6.25.bb
index 53327a794a..d38acfcc8c 100644
--- a/recipes/avahi/avahi-python_0.6.25.bb
+++ b/recipes/avahi/avahi-python_0.6.25.bb
@@ -1,6 +1,5 @@
 require avahi.inc
-
-PR = "r1"
+PR = "${INC_PR}.0"
 
 # FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
 FILES_avahi-discover = ""
diff --git a/recipes/avahi/avahi-ui_0.6.21.bb b/recipes/avahi/avahi-ui_0.6.21.bb
index 3cef5aed0e..e3e5e5be99 100644
--- a/recipes/avahi/avahi-ui_0.6.21.bb
+++ b/recipes/avahi/avahi-ui_0.6.21.bb
@@ -1,6 +1,5 @@
 require avahi.inc
-
-PR = "r8"
+PR = "${INC_PR}.0"
 
 DEPENDS += "avahi gtk+"
 
diff --git a/recipes/avahi/avahi-ui_0.6.25.bb b/recipes/avahi/avahi-ui_0.6.25.bb
index e19d6e9917..2c44d671a3 100644
--- a/recipes/avahi/avahi-ui_0.6.25.bb
+++ b/recipes/avahi/avahi-ui_0.6.25.bb
@@ -1,6 +1,5 @@
 require avahi.inc
-
-PR = "r1"
+PR = "${INC_PR}.0"
 
 DEPENDS += "avahi gtk+"
 
diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc
index 385450d2aa..e601d1f8c8 100644
--- a/recipes/avahi/avahi.inc
+++ b/recipes/avahi/avahi.inc
@@ -5,7 +5,7 @@ SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
-
+INC_PR = "r11"
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
 RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d"
@@ -25,6 +25,7 @@ AVAHI_GTK = "--disable-gtk"
 
 LDFLAGS_append_linux-uclibc = " -lintl"
 LDFLAGS_append_linux-uclibceabi = " -lintl "
+LDFLAGS_append_linux-uclibcspe = " -lintl "
 LDFLAGS_append_uclinux-uclibc = " -lintl"
 
 PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
diff --git a/recipes/avahi/avahi_0.6.19.bb b/recipes/avahi/avahi_0.6.19.bb
index bb9641efb2..6a6825c4e3 100644
--- a/recipes/avahi/avahi_0.6.19.bb
+++ b/recipes/avahi/avahi_0.6.19.bb
@@ -1,6 +1,5 @@
 require avahi.inc
 
-PR = "r10"
-
+PR = "${INC_PR}.0"
 SRC_URI[md5sum] = "a06782435d1c994ecd00a66e95a5d9d4"
 SRC_URI[sha256sum] = "a742dceda38f242f5eac72f2c3bc1bda76adf497d6913e88a9cbc624bf2dd68a"
diff --git a/recipes/avahi/avahi_0.6.20.bb b/recipes/avahi/avahi_0.6.20.bb
index d4d30a6708..5fdc9d493a 100644
--- a/recipes/avahi/avahi_0.6.20.bb
+++ b/recipes/avahi/avahi_0.6.20.bb
@@ -1,6 +1,5 @@
 require avahi.inc
 
-PR = "r10"
-
+PR = "${INC_PR}.0"
 SRC_URI[md5sum] = "6acdff79afa2631f765f3bbbc3e25a74"
 SRC_URI[sha256sum] = "89ae5fd08018679b80cee201e1c1350d86db73bdcf6718aabb4bd3ea86f93ec9"
diff --git a/recipes/avahi/avahi_0.6.21.bb b/recipes/avahi/avahi_0.6.21.bb
index 175d19f011..5372334336 100644
--- a/recipes/avahi/avahi_0.6.21.bb
+++ b/recipes/avahi/avahi_0.6.21.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r10"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch"
 SRC_URI += "file://avr32-ipv6-fix.patch"
diff --git a/recipes/avahi/avahi_0.6.22.bb b/recipes/avahi/avahi_0.6.22.bb
index 6734386027..6e9608ae19 100644
--- a/recipes/avahi/avahi_0.6.22.bb
+++ b/recipes/avahi/avahi_0.6.22.bb
@@ -1,7 +1,7 @@
 require avahi.inc
 
 DEPENDS += "intltool-native"
-PR = "r10"
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "libavahi-gobject"
 
diff --git a/recipes/avahi/avahi_0.6.23.bb b/recipes/avahi/avahi_0.6.23.bb
index 364a692aa9..abf0fbf3d9 100644
--- a/recipes/avahi/avahi_0.6.23.bb
+++ b/recipes/avahi/avahi_0.6.23.bb
@@ -1,7 +1,6 @@
 require avahi.inc
 
-PR = "r1"
-
+PR = "${INC_PR}.0"
 DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"
diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb
index cd699f7809..786f58ffdc 100644
--- a/recipes/avahi/avahi_0.6.24.bb
+++ b/recipes/avahi/avahi_0.6.24.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 DEPENDS += "intltool-native"
 
diff --git a/recipes/avahi/avahi_0.6.25.bb b/recipes/avahi/avahi_0.6.25.bb
index f27b1f959c..4b598a0313 100644
--- a/recipes/avahi/avahi_0.6.25.bb
+++ b/recipes/avahi/avahi_0.6.25.bb
@@ -1,6 +1,6 @@
 require avahi.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 DEPENDS += "intltool-native"