* [PATCH 1/2] fftw: Refactor EXTRA_OECONF
@ 2014-04-14 11:37 Paul Barker
2014-04-14 11:37 ` [PATCH 2/2] fftw: Upgrade to v3.3.4 Paul Barker
2014-04-20 9:29 ` [PATCH 1/2] fftw: Refactor EXTRA_OECONF Martin Jansa
0 siblings, 2 replies; 3+ messages in thread
From: Paul Barker @ 2014-04-14 11:37 UTC (permalink / raw)
To: openembedded-devel
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@paulbarker.me.uk>
---
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"
-
--
1.9.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] fftw: Upgrade to v3.3.4
2014-04-14 11:37 [PATCH 1/2] fftw: Refactor EXTRA_OECONF Paul Barker
@ 2014-04-14 11:37 ` Paul Barker
2014-04-20 9:29 ` [PATCH 1/2] fftw: Refactor EXTRA_OECONF Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Paul Barker @ 2014-04-14 11:37 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
meta-oe/recipes-support/fftw/fftw_3.3.3.bb | 4 ----
meta-oe/recipes-support/fftw/fftw_3.3.4.bb | 4 ++++
meta-oe/recipes-support/fftw/fftwf_3.3.3.bb | 8 --------
meta-oe/recipes-support/fftw/fftwf_3.3.4.bb | 8 ++++++++
meta-oe/recipes-support/fftw/fftwl_3.3.3.bb | 6 ------
meta-oe/recipes-support/fftw/fftwl_3.3.4.bb | 6 ++++++
6 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 meta-oe/recipes-support/fftw/fftw_3.3.3.bb
create mode 100644 meta-oe/recipes-support/fftw/fftw_3.3.4.bb
delete mode 100644 meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
create mode 100644 meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
delete mode 100644 meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
create mode 100644 meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.3.bb b/meta-oe/recipes-support/fftw/fftw_3.3.3.bb
deleted file mode 100644
index b889c91..0000000
--- a/meta-oe/recipes-support/fftw/fftw_3.3.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require fftw.inc
-
-SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
-SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.4.bb b/meta-oe/recipes-support/fftw/fftw_3.3.4.bb
new file mode 100644
index 0000000..5824d41
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftw_3.3.4.bb
@@ -0,0 +1,4 @@
+require fftw.inc
+
+SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3"
+SRC_URI[sha256sum] = "8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
deleted file mode 100644
index 5e4e8ed..0000000
--- a/meta-oe/recipes-support/fftw/fftwf_3.3.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require fftw.inc
-
-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/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
new file mode 100644
index 0000000..59f4a11
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
@@ -0,0 +1,8 @@
+require fftw.inc
+
+EXTRA_OECONF += "--enable-single \
+ ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \
+"
+
+SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3"
+SRC_URI[sha256sum] = "8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982"
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
deleted file mode 100644
index 9c67354..0000000
--- a/meta-oe/recipes-support/fftw/fftwl_3.3.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require fftw.inc
-
-EXTRA_OECONF += "--enable-long-double"
-
-SRC_URI[md5sum] = "0a05ca9c7b3bfddc8278e7c40791a1c2"
-SRC_URI[sha256sum] = "85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3"
diff --git a/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
new file mode 100644
index 0000000..8f37346
--- /dev/null
+++ b/meta-oe/recipes-support/fftw/fftwl_3.3.4.bb
@@ -0,0 +1,6 @@
+require fftw.inc
+
+EXTRA_OECONF += "--enable-long-double"
+
+SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3"
+SRC_URI[sha256sum] = "8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982"
--
1.9.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] fftw: Refactor EXTRA_OECONF
2014-04-14 11:37 [PATCH 1/2] fftw: Refactor EXTRA_OECONF Paul Barker
2014-04-14 11:37 ` [PATCH 2/2] fftw: Upgrade to v3.3.4 Paul Barker
@ 2014-04-20 9:29 ` Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2014-04-20 9:29 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3195 bytes --]
On Mon, Apr 14, 2014 at 12:37:50PM +0100, Paul Barker wrote:
> 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.
Both merged, thanks!
>
> Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
> ---
> 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"
> -
> --
> 1.9.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-20 9:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-14 11:37 [PATCH 1/2] fftw: Refactor EXTRA_OECONF Paul Barker
2014-04-14 11:37 ` [PATCH 2/2] fftw: Upgrade to v3.3.4 Paul Barker
2014-04-20 9:29 ` [PATCH 1/2] fftw: Refactor EXTRA_OECONF Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.