* [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base
@ 2019-10-29 10:20 Martin Siegumfeldt
2019-10-29 21:27 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Martin Siegumfeldt @ 2019-10-29 10:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Martin Siegumfeldt
* inherit only when libiio-python3 is build.
* also add PACKAGECONFIG variant that allows python bindings to be
enabled and disabled. It adheres to the current CMake logic and
defaults to an 'out-out' approach.
Signed-off-by: Martin Siegumfeldt <mns@gomspace.com>
---
meta-oe/recipes-support/libiio/libiio_git.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
index e6e0eaef8..ec3a39de1 100644
--- a/meta-oe/recipes-support/libiio/libiio_git.bb
+++ b/meta-oe/recipes-support/libiio/libiio_git.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
S = "${WORKDIR}/git"
-inherit cmake python3native systemd distutils3-base
+inherit cmake python3native systemd
DEPENDS = " \
flex-native bison-native libaio \
@@ -25,10 +25,13 @@ EXTRA_OECMAKE = " \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
"
-PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND"
+PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS"
PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2"
PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
+PACKAGECONFIG[PYTHON_BINDINGS] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)}
PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}"
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base
2019-10-29 10:20 [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base Martin Siegumfeldt
@ 2019-10-29 21:27 ` Khem Raj
2019-10-30 13:42 ` Martin Siegumfeldt
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2019-10-29 21:27 UTC (permalink / raw)
To: Martin Siegumfeldt; +Cc: openembeded-devel
On Tue, Oct 29, 2019 at 11:21 AM Martin Siegumfeldt <mns@gomspace.com> wrote:
>
> * inherit only when libiio-python3 is build.
>
> * also add PACKAGECONFIG variant that allows python bindings to be
> enabled and disabled. It adheres to the current CMake logic and
> defaults to an 'out-out' approach.
>
> Signed-off-by: Martin Siegumfeldt <mns@gomspace.com>
> ---
> meta-oe/recipes-support/libiio/libiio_git.bb | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
> index e6e0eaef8..ec3a39de1 100644
> --- a/meta-oe/recipes-support/libiio/libiio_git.bb
> +++ b/meta-oe/recipes-support/libiio/libiio_git.bb
> @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
>
> S = "${WORKDIR}/git"
>
> -inherit cmake python3native systemd distutils3-base
> +inherit cmake python3native systemd
>
> DEPENDS = " \
> flex-native bison-native libaio \
> @@ -25,10 +25,13 @@ EXTRA_OECMAKE = " \
> ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
> "
>
> -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND"
> +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS"
this change is not needed.
>
> PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2"
> PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
> +PACKAGECONFIG[PYTHON_BINDINGS] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"
this should be
PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)}
>
> PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}"
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base
2019-10-29 21:27 ` Khem Raj
@ 2019-10-30 13:42 ` Martin Siegumfeldt
0 siblings, 0 replies; 3+ messages in thread
From: Martin Siegumfeldt @ 2019-10-30 13:42 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
_____________________________________
From: Khem Raj <raj.khem@gmail.com>
Sent: Tuesday, October 29, 2019 10:27 PM
To: Martin Siegumfeldt
Cc: openembeded-devel
Subject: Re: [oe] [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base
On Tue, Oct 29, 2019 at 11:21 AM Martin Siegumfeldt <mns@gomspace.com> wrote:
>
> * inherit only when libiio-python3 is build.
>
> * also add PACKAGECONFIG variant that allows python bindings to be
> enabled and disabled. It adheres to the current CMake logic and
> defaults to an 'out-out' approach.
>
> Signed-off-by: Martin Siegumfeldt <mns@gomspace.com>
> ---
> meta-oe/recipes-support/libiio/libiio_git.bb | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-oe/recipes-support/libiio/libiio_git.bb
> index e6e0eaef8..ec3a39de1 100644
> --- a/meta-oe/recipes-support/libiio/libiio_git.bb
> +++ b/meta-oe/recipes-support/libiio/libiio_git.bb
> @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https"
>
> S = "${WORKDIR}/git"
>
> -inherit cmake python3native systemd distutils3-base
> +inherit cmake python3native systemd
>
> DEPENDS = " \
> flex-native bison-native libaio \
> @@ -25,10 +25,13 @@ EXTRA_OECMAKE = " \
> ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DWITH_SYSTEMD=ON -DSYSTEMD_UNIT_INSTALL_DIR=${systemd_system_unitdir}', '', d)} \
> "
>
> -PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND"
> +PACKAGECONFIG ??= "USB_BACKEND NETWORK_BACKEND PYTHON_BINDINGS"
this change is not needed.
>
> PACKAGECONFIG[USB_BACKEND] = "-DWITH_USB_BACKEND=ON,-DWITH_USB_BACKEND=OFF,libusb1,libxml2"
> PACKAGECONFIG[NETWORK_BACKEND] = "-DWITH_NETWORK_BACKEND=ON,-DWITH_NETWORK_BACKEND=OFF,libxml2"
> +PACKAGECONFIG[PYTHON_BINDINGS] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"
this should be
PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF"
Ok, patch updated and resent - hopefully we are closing in :)
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'libiio-python3', 'distutils3-base', '', d)}
>
> PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}"
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-30 13:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-29 10:20 [meta-oe][PATCH v2] libiio: Conditionally inherit distutils3-base Martin Siegumfeldt
2019-10-29 21:27 ` Khem Raj
2019-10-30 13:42 ` Martin Siegumfeldt
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.