* [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed
@ 2021-07-04 12:32 Fabrice Fontaine
2021-07-04 12:32 ` [Buildroot] [PATCH 2/2] package/granite: bump to version 6.0.0 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-07-04 12:32 UTC (permalink / raw)
To: buildroot
Link with TARGET_NLS_LIBS if needed to avoid the following build
failure:
/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: lib/libgranite.so.5.4.0.p/meson-generated_Application.c.o: in function `_vala_array_free.constprop.0':
Application.c:(.text+0x340): undefined reference to `libintl_bindtextdomain'
Fixes:
- http://autobuild.buildroot.org/results/d754cb776a1e11031cef4e66d45619aad5c4575d
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/granite/granite.mk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/granite/granite.mk b/package/granite/granite.mk
index d5dd1fa1ff..037113f715 100644
--- a/package/granite/granite.mk
+++ b/package/granite/granite.mk
@@ -6,10 +6,17 @@
GRANITE_VERSION = 5.4.0
GRANITE_SITE = $(call github,elementary,granite,$(GRANITE_VERSION))
-GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3
+GRANITE_DEPENDENCIES = \
+ host-pkgconf \
+ host-vala \
+ libgee \
+ libglib2 \
+ libgtk3 \
+ $(TARGET_NLS_DEPENDENCIES)
GRANITE_INSTALL_STAGING = YES
GRANITE_LICENSE = LGPL-3.0+
GRANITE_LICENSE_FILES = COPYING
+GRANITE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
GRANITE_CONF_OPTS += -Dintrospection=true
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/granite: bump to version 6.0.0 2021-07-04 12:32 [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed Fabrice Fontaine @ 2021-07-04 12:32 ` Fabrice Fontaine 2021-07-20 20:36 ` Thomas Petazzoni 2021-08-04 14:30 ` Peter Korsgaard 2 siblings, 0 replies; 5+ messages in thread From: Fabrice Fontaine @ 2021-07-04 12:32 UTC (permalink / raw) To: buildroot Drop patch (already in version) https://github.com/elementary/granite/releases/tag/6.0.0 https://github.com/elementary/granite/releases/tag/5.5.0 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- .../0001-meson-add-introspection-option.patch | 73 ------------------- package/granite/granite.hash | 2 +- package/granite/granite.mk | 2 +- 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 package/granite/0001-meson-add-introspection-option.patch diff --git a/package/granite/0001-meson-add-introspection-option.patch b/package/granite/0001-meson-add-introspection-option.patch deleted file mode 100644 index 4b32fb13c3..0000000000 --- a/package/granite/0001-meson-add-introspection-option.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4d5ddcdb9c03d4e829fe7080e497a00f0b379eff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 14 Jun 2020 17:33:31 +0200 -Subject: [PATCH] meson: add introspection option - -This will allow the user to build granite without gobject-introspection - -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[Upstream status: https://github.com/elementary/granite/pull/410] ---- - lib/meson.build | 38 ++++++++++++++++++++------------------ - meson_options.txt | 1 + - 2 files changed, 21 insertions(+), 18 deletions(-) - -diff --git a/lib/meson.build b/lib/meson.build -index a9fc4ed4..770feeb5 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -98,24 +98,26 @@ install_data( - install_dir: include_dir - ) - --# typelib generation isn't automated yet --g_ir_compiler = find_program('g-ir-compiler') --custom_target( -- granite_typelib, -- command: [ -- g_ir_compiler, -- '--shared-library', -- '@PLAINNAME@', -- '--output', -- '@OUTPUT@', -- join_paths(meson.current_build_dir(), granite_gir), -- ], -- input: libgranite, -- output: granite_typelib, -- depends: libgranite, -- install: true, -- install_dir: join_paths(get_option('libdir'), 'girepository-1.0'), --) -+if get_option('introspection') -+ # typelib generation isn't automated yet -+ g_ir_compiler = find_program('g-ir-compiler') -+ custom_target( -+ granite_typelib, -+ command: [ -+ g_ir_compiler, -+ '--shared-library', -+ '@PLAINNAME@', -+ '--output', -+ '@OUTPUT@', -+ join_paths(meson.current_build_dir(), granite_gir), -+ ], -+ input: libgranite, -+ output: granite_typelib, -+ depends: libgranite, -+ install: true, -+ install_dir: join_paths(get_option('libdir'), 'girepository-1.0'), -+ ) -+endif - - libgranite_dep = declare_dependency( - link_with: libgranite, -diff --git a/meson_options.txt b/meson_options.txt -index 9d9f62e9..bd1a1d6f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1 +1,2 @@ - option('documentation', type: 'boolean', value: false, description: 'generate documentation with gtk-doc and valadoc') -+option('introspection', type: 'boolean', value: true, description: 'Whether to build introspection files') --- -2.26.2 - diff --git a/package/granite/granite.hash b/package/granite/granite.hash index 5378b30cba..a91f468b49 100644 --- a/package/granite/granite.hash +++ b/package/granite/granite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8194031cac3b87d84a3fab9c30270485ce73f8b8ec23f26c9152b6859c8a18fd granite-5.4.0.tar.gz +sha256 c62d8d29e8bb59a5fa2d9006a9c13196aea9159410a7c86e3d51fa10d0f9dcc0 granite-6.0.0.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/granite/granite.mk b/package/granite/granite.mk index 037113f715..71dfbf4c03 100644 --- a/package/granite/granite.mk +++ b/package/granite/granite.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRANITE_VERSION = 5.4.0 +GRANITE_VERSION = 6.0.0 GRANITE_SITE = $(call github,elementary,granite,$(GRANITE_VERSION)) GRANITE_DEPENDENCIES = \ host-pkgconf \ -- 2.30.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed @ 2021-07-20 20:36 ` Thomas Petazzoni 0 siblings, 0 replies; 5+ messages in thread From: Thomas Petazzoni @ 2021-07-20 20:36 UTC (permalink / raw) To: buildroot On Sun, 4 Jul 2021 14:32:05 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Link with TARGET_NLS_LIBS if needed to avoid the following build > failure: > > /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: lib/libgranite.so.5.4.0.p/meson-generated_Application.c.o: in function `_vala_array_free.constprop.0': > Application.c:(.text+0x340): undefined reference to `libintl_bindtextdomain' > > Fixes: > - http://autobuild.buildroot.org/results/d754cb776a1e11031cef4e66d45619aad5c4575d > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/granite/granite.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed @ 2021-07-20 20:36 ` Thomas Petazzoni 0 siblings, 0 replies; 5+ messages in thread From: Thomas Petazzoni @ 2021-07-20 20:36 UTC (permalink / raw) To: Fabrice Fontaine; +Cc: buildroot On Sun, 4 Jul 2021 14:32:05 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Link with TARGET_NLS_LIBS if needed to avoid the following build > failure: > > /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: lib/libgranite.so.5.4.0.p/meson-generated_Application.c.o: in function `_vala_array_free.constprop.0': > Application.c:(.text+0x340): undefined reference to `libintl_bindtextdomain' > > Fixes: > - http://autobuild.buildroot.org/results/d754cb776a1e11031cef4e66d45619aad5c4575d > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/granite/granite.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Both applied, thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed 2021-07-04 12:32 [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed Fabrice Fontaine 2021-07-04 12:32 ` [Buildroot] [PATCH 2/2] package/granite: bump to version 6.0.0 Fabrice Fontaine 2021-07-20 20:36 ` Thomas Petazzoni @ 2021-08-04 14:30 ` Peter Korsgaard 2 siblings, 0 replies; 5+ messages in thread From: Peter Korsgaard @ 2021-08-04 14:30 UTC (permalink / raw) To: Fabrice Fontaine; +Cc: buildroot >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Link with TARGET_NLS_LIBS if needed to avoid the following build > failure: > /home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: > lib/libgranite.so.5.4.0.p/meson-generated_Application.c.o: in function > `_vala_array_free.constprop.0': > Application.c:(.text+0x340): undefined reference to `libintl_bindtextdomain' > Fixes: > - http://autobuild.buildroot.org/results/d754cb776a1e11031cef4e66d45619aad5c4575d > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2021.02.x and 2021.05.x, thanks. -- Bye, Peter Korsgaard _______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-04 14:30 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-04 12:32 [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed Fabrice Fontaine 2021-07-04 12:32 ` [Buildroot] [PATCH 2/2] package/granite: bump to version 6.0.0 Fabrice Fontaine 2021-07-20 20:36 ` [Buildroot] [PATCH 1/2] package/granite: link with -lintl if needed Thomas Petazzoni 2021-07-20 20:36 ` Thomas Petazzoni 2021-08-04 14:30 ` Peter Korsgaard
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.