[oe-commits] Frans Meulenbroeks : libvorbis: moved EXTRA_OECONF from inc to individual recipes

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 065e7b5619c19e81cd310b8d87eb20f4a6a14625
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=065e7b5619c19e81cd310b8d87eb20f4a6a14625

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Sat Oct 23 16:09:12 2010 +0200

libvorbis: moved EXTRA_OECONF from inc to individual recipes

this allows elimination of the override
EXTRA_OECONF = "" in the 1.2.3 (and later) recipes

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 recipes/libvorbis/libvorbis.inc      |    4 ----
 recipes/libvorbis/libvorbis_1.0.1.bb |    4 +++-
 recipes/libvorbis/libvorbis_1.2.0.bb |    4 +++-
 recipes/libvorbis/libvorbis_1.2.3.bb |    3 ---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/recipes/libvorbis/libvorbis.inc b/recipes/libvorbis/libvorbis.inc
index b3a154a..2054849 100644
--- a/recipes/libvorbis/libvorbis.inc
+++ b/recipes/libvorbis/libvorbis.inc
@@ -12,8 +12,4 @@ inherit autotools
 # thumb instruction set...
 FULL_OPTIMIZATION_thumb = "-O0"
 
-EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
-	        --with-ogg-includes=${STAGING_INCDIR}"
-
-
 LEAD_SONAME = "libvorbis.so.0"
diff --git a/recipes/libvorbis/libvorbis_1.0.1.bb b/recipes/libvorbis/libvorbis_1.0.1.bb
index 2e8e18a..303d66b 100644
--- a/recipes/libvorbis/libvorbis_1.0.1.bb
+++ b/recipes/libvorbis/libvorbis_1.0.1.bb
@@ -3,9 +3,11 @@ require libvorbis.inc
 
 PR = "${INC_PR}.1"
 
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+	        --with-ogg-includes=${STAGING_INCDIR}"
+
 SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \
 file://m4.patch"
 
-
 SRC_URI[md5sum] = "4d6726fd02ce02f6e24824e594b0949a"
 SRC_URI[sha256sum] = "20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7"
diff --git a/recipes/libvorbis/libvorbis_1.2.0.bb b/recipes/libvorbis/libvorbis_1.2.0.bb
index 069b83f..fa3a483 100644
--- a/recipes/libvorbis/libvorbis_1.2.0.bb
+++ b/recipes/libvorbis/libvorbis_1.2.0.bb
@@ -3,6 +3,9 @@ require libvorbis.inc
 
 PR = "${INC_PR}.1"
 
+EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
+	        --with-ogg-includes=${STAGING_INCDIR}"
+
 SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
 	   file://configure_powerpc-no-fixed-cpu.patch \
 	   file://r14598-CVE-2008-1420.patch \
@@ -10,6 +13,5 @@ SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
 	   file://r14602-CVE-2008-1423.patch \
 	  "
 
-
 SRC_URI[md5sum] = "478646358c49f34aedcce58948793619"
 SRC_URI[sha256sum] = "6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73"
diff --git a/recipes/libvorbis/libvorbis_1.2.3.bb b/recipes/libvorbis/libvorbis_1.2.3.bb
index 04e6c91..96462e4 100644
--- a/recipes/libvorbis/libvorbis_1.2.3.bb
+++ b/recipes/libvorbis/libvorbis_1.2.3.bb
@@ -12,8 +12,5 @@ SRC_URI = "http://downloads.xiph.org/releases/vorbis/libvorbis-${PV}.tar.gz \
 	   file://patch-lib_res0.c;apply=yes;striplevel=0 \
 	  "
 
-# override should be handeld by pkgconfig now
-EXTRA_OECONF = ""
-
 SRC_URI[md5sum] = "5aa77f55c0e0aab8eb8ed982335daac8"
 SRC_URI[sha256sum] = "c679d1e5e45a3ec8aceb5e71de8e3712630b7a6dec6952886c17435a65955947"