* [Buildroot] [PATCH 1/1] package/gcr: don't require gnupg2
@ 2022-05-19 4:55 James Hilliard
2022-05-25 6:50 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: James Hilliard @ 2022-05-19 4:55 UTC (permalink / raw)
To: buildroot; +Cc: James Hilliard
Requiring BR2_PACKAGE_GNUPG2 introduced a recursive dependency,
since it appears gcr also supports gnupg we don't need to depend
on !BR2_PACKAGE_GNUPG and can use gnupg if needed.
Fixes:
package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected!
package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
package/webkitgtk/Config.in:90: symbol BR2_PACKAGE_WEBKITGTK_MULTIMEDIA depends on BR2_PACKAGE_WEBKITGTK
package/webkitgtk/Config.in:24: symbol BR2_PACKAGE_WEBKITGTK is selected by BR2_PACKAGE_MIDORI
package/midori/Config.in:24: symbol BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_GNUPG
package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_PYTHON_GNUPG
package/python-gnupg/Config.in:1: symbol BR2_PACKAGE_PYTHON_GNUPG depends on BR2_PACKAGE_PYTHON3
package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS
package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2
package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2
package/fluidsynth/Config.in:38: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH
package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
package/gstreamer1/gst1-plugins-bad/Config.in:438: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
package/gcr/Config.in | 14 ++------------
package/gcr/gcr.mk | 10 +++++++---
package/midori/Config.in | 6 ------
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/package/gcr/Config.in b/package/gcr/Config.in
index afbec1a317..7c5fdba008 100644
--- a/package/gcr/Config.in
+++ b/package/gcr/Config.in
@@ -1,12 +1,11 @@
config BR2_PACKAGE_GCR
bool "gcr"
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gnupg2
depends on BR2_USE_WCHAR # libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
depends on BR2_USE_MMU # libglib2
depends on !BR2_STATIC_LIBS # p11-kit
- depends on !BR2_PACKAGE_GNUPG # gnupg2
- select BR2_PACKAGE_GNUPG2 # runtime
+ select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime
+ select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_P11_KIT
@@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR
https://developer.gnome.org/gcr/
comment "gcr needs a toolchain w/ wchar, threads, dynamic library"
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
BR2_STATIC_LIBS
-
-comment "gcr is incompatible with gnupg, gnupg2 only"
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
- depends on BR2_USE_WCHAR
- depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_USE_MMU
- depends on !BR2_STATIC_LIBS
- depends on BR2_PACKAGE_GNUPG # gnupg2
diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk
index ef253b4ef9..d479de82d3 100644
--- a/package/gcr/gcr.mk
+++ b/package/gcr/gcr.mk
@@ -15,14 +15,18 @@ GCR_DEPENDENCIES = \
p11-kit \
$(TARGET_NLS_DEPENDENCIES)
GCR_INSTALL_STAGING = YES
-GCR_CONF_OPTS = \
- -Dgpg_path=/usr/bin/gpg2 \
- -Dgtk_doc=false
+GCR_CONF_OPTS = -Dgtk_doc=false
# Even though COPYING is v2 the code states v2.1+
GCR_LICENSE = LGPL-2.1+
GCR_LICENSE_FILES = COPYING
GCR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
+ifeq ($(BR2_PACKAGE_GNUPG2),y)
+GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg2
+else
+GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg
+endif
+
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala
GCR_CONF_OPTS += -Dintrospection=true
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 308b0a7a42..f45444a289 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
- depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
depends on !BR2_BINFMT_FLAT # webkitgtk -> icu
@@ -21,15 +20,10 @@ comment "midori needs libgtk3 w/ X11 or wayland backend"
depends on !BR2_PACKAGE_LIBGTK3_X11 && \
!BR2_PACKAGE_LIBGTK3_WAYLAND
-comment "midori is incompatible with gnupg, gnupg2 only"
- depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
- depends on BR2_PACKAGE_GNUPG
-
config BR2_PACKAGE_MIDORI
bool "midori"
depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
depends on !BR2_STATIC_LIBS # webkitgtk
- depends on !BR2_PACKAGE_GNUPG # gcr
depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/gcr: don't require gnupg2
2022-05-19 4:55 [Buildroot] [PATCH 1/1] package/gcr: don't require gnupg2 James Hilliard
@ 2022-05-25 6:50 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-05-25 6:50 UTC (permalink / raw)
To: James Hilliard; +Cc: buildroot
James, All,
On 2022-05-18 22:55 -0600, James Hilliard spake thusly:
> Requiring BR2_PACKAGE_GNUPG2 introduced a recursive dependency,
> since it appears gcr also supports gnupg we don't need to depend
> on !BR2_PACKAGE_GNUPG and can use gnupg if needed.
>
> Fixes:
> package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected!
> package/gstreamer1/gstreamer1/Config.in:5: symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
> package/webkitgtk/Config.in:90: symbol BR2_PACKAGE_WEBKITGTK_MULTIMEDIA depends on BR2_PACKAGE_WEBKITGTK
> package/webkitgtk/Config.in:24: symbol BR2_PACKAGE_WEBKITGTK is selected by BR2_PACKAGE_MIDORI
> package/midori/Config.in:24: symbol BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_GNUPG
> package/gnupg/Config.in:1: symbol BR2_PACKAGE_GNUPG is selected by BR2_PACKAGE_PYTHON_GNUPG
> package/python-gnupg/Config.in:1: symbol BR2_PACKAGE_PYTHON_GNUPG depends on BR2_PACKAGE_PYTHON3
> package/python3/Config.in:5: symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS
> package/jack2/Config.in:35: symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2
> package/jack2/Config.in:1: symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2
> package/fluidsynth/Config.in:38: symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH
> package/fluidsynth/Config.in:1: symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
> package/gstreamer1/gst1-plugins-bad/Config.in:438: symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1
>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/gcr/Config.in | 14 ++------------
> package/gcr/gcr.mk | 10 +++++++---
> package/midori/Config.in | 6 ------
> 3 files changed, 9 insertions(+), 21 deletions(-)
>
> diff --git a/package/gcr/Config.in b/package/gcr/Config.in
> index afbec1a317..7c5fdba008 100644
> --- a/package/gcr/Config.in
> +++ b/package/gcr/Config.in
> @@ -1,12 +1,11 @@
> config BR2_PACKAGE_GCR
> bool "gcr"
> - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gnupg2
> depends on BR2_USE_WCHAR # libglib2
> depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
> depends on BR2_USE_MMU # libglib2
> depends on !BR2_STATIC_LIBS # p11-kit
> - depends on !BR2_PACKAGE_GNUPG # gnupg2
> - select BR2_PACKAGE_GNUPG2 # runtime
> + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime
> + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime
> select BR2_PACKAGE_LIBGCRYPT
> select BR2_PACKAGE_LIBGLIB2
> select BR2_PACKAGE_P11_KIT
> @@ -16,15 +15,6 @@ config BR2_PACKAGE_GCR
> https://developer.gnome.org/gcr/
>
> comment "gcr needs a toolchain w/ wchar, threads, dynamic library"
> - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
> depends on BR2_USE_MMU
> depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
> BR2_STATIC_LIBS
> -
> -comment "gcr is incompatible with gnupg, gnupg2 only"
> - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
> - depends on BR2_USE_WCHAR
> - depends on BR2_TOOLCHAIN_HAS_THREADS
> - depends on BR2_USE_MMU
> - depends on !BR2_STATIC_LIBS
> - depends on BR2_PACKAGE_GNUPG # gnupg2
> diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk
> index ef253b4ef9..d479de82d3 100644
> --- a/package/gcr/gcr.mk
> +++ b/package/gcr/gcr.mk
> @@ -15,14 +15,18 @@ GCR_DEPENDENCIES = \
> p11-kit \
> $(TARGET_NLS_DEPENDENCIES)
> GCR_INSTALL_STAGING = YES
> -GCR_CONF_OPTS = \
> - -Dgpg_path=/usr/bin/gpg2 \
> - -Dgtk_doc=false
> +GCR_CONF_OPTS = -Dgtk_doc=false
> # Even though COPYING is v2 the code states v2.1+
> GCR_LICENSE = LGPL-2.1+
> GCR_LICENSE_FILES = COPYING
> GCR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
>
> +ifeq ($(BR2_PACKAGE_GNUPG2),y)
> +GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg2
> +else
> +GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg
> +endif
> +
> ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
> GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala
> GCR_CONF_OPTS += -Dintrospection=true
> diff --git a/package/midori/Config.in b/package/midori/Config.in
> index 308b0a7a42..f45444a289 100644
> --- a/package/midori/Config.in
> +++ b/package/midori/Config.in
> @@ -4,7 +4,6 @@ config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
> depends on BR2_USE_MMU
> depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
> depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
> - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
> depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> depends on !BR2_BINFMT_FLAT # webkitgtk -> icu
>
> @@ -21,15 +20,10 @@ comment "midori needs libgtk3 w/ X11 or wayland backend"
> depends on !BR2_PACKAGE_LIBGTK3_X11 && \
> !BR2_PACKAGE_LIBGTK3_WAYLAND
>
> -comment "midori is incompatible with gnupg, gnupg2 only"
> - depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
> - depends on BR2_PACKAGE_GNUPG
> -
> config BR2_PACKAGE_MIDORI
> bool "midori"
> depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
> depends on !BR2_STATIC_LIBS # webkitgtk
> - depends on !BR2_PACKAGE_GNUPG # gcr
> depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
> depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-25 6:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-19 4:55 [Buildroot] [PATCH 1/1] package/gcr: don't require gnupg2 James Hilliard
2022-05-25 6:50 ` Yann E. MORIN
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.