[oe-commits] Paul Barker : fftw: Refactor EXTRA_OECONF

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 41d12539e11c342781025ae5f38b0d6ba43651f2
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=41d12539e11c342781025ae5f38b0d6ba43651f2

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Mon Apr 14 12:37:50 2014 +0100

fftw: Refactor EXTRA_OECONF

The configure flags common to all three fftw recipes are moved into fftw.inc and
then each recipe just appends the extra flags it needs. This makes it easier to
read and modify options which affect all three recipes.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/fftw/fftw.inc       | 2 ++
 meta-oe/recipes-support/fftw/fftw_3.3.3.bb  | 3 ---
 meta-oe/recipes-support/fftw/fftwf_3.3.3.bb | 4 +---
 meta-oe/recipes-support/fftw/fftwl_3.3.3.bb | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-support/fftw/fftw.inc b/meta-oe/recipes-support/fftw/fftw.inc
index 074a53b..6bd622d 100644
--- a/meta-oe/recipes-support/fftw/fftw.inc
+++ b/meta-oe/recipes-support/fftw/fftw.inc
@@ -11,6 +11,8 @@ S = "${WORKDIR}/fftw-${PV}"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads"
+
 do_configure_prepend() {
     echo 'AM_PROG_AS' >> ${S}/configure.ac 
 }
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.3.bb b/meta-oe/recipes-support/fftw/fftw_3.3.3.bb
index 03a1274..b889c91 100644
--- a/meta-oe/recipes-support/fftw/fftw_3.3.3.bb
+++ b/meta-oe/recipes-support/fftw/fftw_3.3.3.bb
@@ -1,7 +1,4 @@
 require fftw.inc
 
-EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads"
-
 SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
 SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
-
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
index e2989d6..5e4e8ed 100644
--- a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
+++ b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
@@ -1,10 +1,8 @@
 require fftw.inc
 
-EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared \
-    --enable-threads \
+EXTRA_OECONF += "--enable-single \
     ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \
 "
 
 SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
 SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
-
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
index b28784e..9c67354 100644
--- a/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
+++ b/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
@@ -1,7 +1,6 @@
 require fftw.inc
 
-EXTRA_OECONF = "--disable-fortran --enable-long-double --enable-shared --enable-threads"
+EXTRA_OECONF += "--enable-long-double"
 
 SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
 SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
-