| Message ID | 20220530210243.3055759-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/gcr: put back BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS dependency | expand |
On Mon, 30 May 2022 23:02:43 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Commit 5452b5887005298a87650ff4003ecfaecfd9aca0 wrongly removed > BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS dependency resulting in the > following build failure: > > Makefile:576: *** libgpg-error is in the dependency chain of libgcrypt that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. > > Fixes: > - http://autobuild.buildroot.org/results/261a137824109342fd83b766a299c1eeda6ff401 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/gcr/Config.in | 2 ++ > package/midori/Config.in | 1 + > 2 files changed, 3 insertions(+) Applied to master, thanks. Thomas
diff --git a/package/gcr/Config.in b/package/gcr/Config.in index 7c5fdba008..dbc22cf478 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GCR bool "gcr" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -> libgpg-error depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 @@ -15,6 +16,7 @@ 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 diff --git a/package/midori/Config.in b/package/midori/Config.in index f45444a289..6029c0a9df 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -4,6 +4,7 @@ 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 # gcr -> libgcrypt -> libgpg-error depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # webkitgtk -> icu
Commit 5452b5887005298a87650ff4003ecfaecfd9aca0 wrongly removed BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS dependency resulting in the following build failure: Makefile:576: *** libgpg-error is in the dependency chain of libgcrypt that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in. Stop. Fixes: - http://autobuild.buildroot.org/results/261a137824109342fd83b766a299c1eeda6ff401 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/gcr/Config.in | 2 ++ package/midori/Config.in | 1 + 2 files changed, 3 insertions(+)