* [meta-oe][PATCH] meta-oe: master: remmina - use PACKAGECONFIG for spice
@ 2020-02-19 11:51 Jan-Simon Moeller
0 siblings, 0 replies; 3+ messages in thread
From: Jan-Simon Moeller @ 2020-02-19 11:51 UTC (permalink / raw)
To: openembedded-devel
remmina depends on spice and spice-protocol but they are in meta-networking.
Use the PACKAGECONFIG flag to avoid hardcoding the dependency.
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
---
meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
index f9963ff65..f9860a11f 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
@@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret"
-DEPENDS_append_x86 = " spice spice-protocol"
-DEPENDS_append_x86-64 = " spice spice-protocol"
DEPENDS_append_libc-musl = " libexecinfo"
LDFLAGS_append_libc-musl = " -lexecinfo"
@@ -23,11 +21,7 @@ inherit cmake features_check mime-xdg
# depends on avahi-ui with this restriction
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF"
-
-EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON"
-EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON"
-
+EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF"
do_install_append(){
# We dont need the extra stuff form other desktop environments
@@ -36,6 +30,8 @@ do_install_append(){
rm -rf ${D}/${datadir}/gnome-session
}
+PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol"
+
RDEPENDS_${PN} = "bash"
FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH] meta-oe: master: remmina - use PACKAGECONFIG for spice
2020-02-19 11:56 Jan-Simon Moeller
@ 2020-02-20 12:52 ` Peter Kjellerstedt
0 siblings, 0 replies; 3+ messages in thread
From: Peter Kjellerstedt @ 2020-02-20 12:52 UTC (permalink / raw)
To: Jan-Simon Moeller, openembedded-devel
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org <openembedded-
> devel-bounces@lists.openembedded.org> On Behalf Of Jan-Simon Moeller
> Sent: den 19 februari 2020 12:57
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [meta-oe][PATCH] meta-oe: master: remmina - use PACKAGECONFIG for spice
Change the subject to:
[meta-oe][PATCH] remmina: use PACKAGECONFIG for spice
The target layer and branch should be specified within [] as they are only
there for the review process. Typically you only prefix the Git commit
subject with "<recipe name>: " and then use, e.g., `git format-patch
--subject-prefix='meta-oe][master][PATCH' ...` to create the patch with the
appropriate prefixes.
> remmina depends on spice and spice-protocol but they are in meta-networking.
> Use the PACKAGECONFIG flag to avoid hardcoding the dependency.
>
> Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
> ---
> meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
> index f9963ff65..f9860a11f 100644
> --- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
> +++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
> @@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl"
> LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
> DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret"
>
> -DEPENDS_append_x86 = " spice spice-protocol"
> -DEPENDS_append_x86-64 = " spice spice-protocol"
>
> DEPENDS_append_libc-musl = " libexecinfo"
> LDFLAGS_append_libc-musl = " -lexecinfo"
> @@ -23,11 +21,7 @@ inherit cmake features_check mime-xdg
> # depends on avahi-ui with this restriction
> ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF"
> -
> -EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON"
> -EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON"
> -
> +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF"
>
> do_install_append(){
> # We dont need the extra stuff form other desktop environments
> @@ -36,6 +30,8 @@ do_install_append(){
> rm -rf ${D}/${datadir}/gnome-session
> }
>
> +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol"
> +
PACKAGECONFIGs are typically placed before inherit in the recipes.
> RDEPENDS_${PN} = "bash"
>
> FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
> --
> 2.11.0
//Peter
^ permalink raw reply [flat|nested] 3+ messages in thread
* [meta-oe][PATCH] meta-oe: master: remmina - use PACKAGECONFIG for spice
@ 2020-02-19 11:56 Jan-Simon Moeller
2020-02-20 12:52 ` Peter Kjellerstedt
0 siblings, 1 reply; 3+ messages in thread
From: Jan-Simon Moeller @ 2020-02-19 11:56 UTC (permalink / raw)
To: openembedded-devel
remmina depends on spice and spice-protocol but they are in meta-networking.
Use the PACKAGECONFIG flag to avoid hardcoding the dependency.
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
---
meta-oe/recipes-support/remmina/remmina_1.3.6.bb | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
index f9963ff65..f9860a11f 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.3.6.bb
@@ -5,8 +5,6 @@ LICENSE = "GPLv2 & openssl"
LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769"
DEPENDS += "openssl freerdp gtk+3 gdk-pixbuf atk libgcrypt avahi-ui libsodium libssh vte json-glib libsoup-2.4 libvncserver libsecret"
-DEPENDS_append_x86 = " spice spice-protocol"
-DEPENDS_append_x86-64 = " spice spice-protocol"
DEPENDS_append_libc-musl = " libexecinfo"
LDFLAGS_append_libc-musl = " -lexecinfo"
@@ -23,11 +21,7 @@ inherit cmake features_check mime-xdg
# depends on avahi-ui with this restriction
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF -DWITH_SPICE=OFF"
-
-EXTRA_OECMAKE_append_x86 = " -DWITH_SPICE=ON"
-EXTRA_OECMAKE_append_x86-64 = " -DWITH_SPICE=ON"
-
+EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF"
do_install_append(){
# We dont need the extra stuff form other desktop environments
@@ -36,6 +30,8 @@ do_install_append(){
rm -rf ${D}/${datadir}/gnome-session
}
+PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol"
+
RDEPENDS_${PN} = "bash"
FILES_${PN}_append = " ${datadir}/icons/hicolor/*"
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-20 12:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19 11:51 [meta-oe][PATCH] meta-oe: master: remmina - use PACKAGECONFIG for spice Jan-Simon Moeller
2020-02-19 11:56 Jan-Simon Moeller
2020-02-20 12:52 ` Peter Kjellerstedt
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.