diff options
| -rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch | 52 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb | 3 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch new file mode 100644 index 0000000000..46a6916434 --- /dev/null +++ b/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch | |||
| @@ -0,0 +1,52 @@ | |||
| 1 | From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Tue, 23 Feb 2021 08:47:54 +0000 | ||
| 4 | Subject: [PATCH] meson.build: use relative path | ||
| 5 | |||
| 6 | Fixes: | ||
| 7 | Fatal error: can't create | ||
| 8 | gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61] | ||
| 11 | |||
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 13 | --- | ||
| 14 | gdk/gdkmm/meson.build | 4 ++-- | ||
| 15 | gtk/gtkmm/meson.build | 4 ++-- | ||
| 16 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build | ||
| 19 | index afccaea..240ce4d 100644 | ||
| 20 | --- a/gdk/gdkmm/meson.build | ||
| 21 | +++ b/gdk/gdkmm/meson.build | ||
| 22 | @@ -200,9 +200,9 @@ else # not maintainer_mode | ||
| 23 | gdkmm_hg_ccg_basenames, | ||
| 24 | ) | ||
| 25 | |||
| 26 | - built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ] | ||
| 27 | + built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ] | ||
| 28 | foreach file : gdkmm_used_hg_ccg_basenames | ||
| 29 | - built_cc_files += src_untracked_gdkmm / file + '.cc' | ||
| 30 | + built_cc_files += '../..' / untracked_gdkmm / file + '.cc' | ||
| 31 | endforeach | ||
| 32 | |||
| 33 | gdk_gen_sources = built_cc_files | ||
| 34 | diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build | ||
| 35 | index ab96a22..cc0c050 100644 | ||
| 36 | --- a/gtk/gtkmm/meson.build | ||
| 37 | +++ b/gtk/gtkmm/meson.build | ||
| 38 | @@ -464,9 +464,9 @@ else # not maintainer_mode | ||
| 39 | gtkmm_hg_ccg_basenames, | ||
| 40 | ) | ||
| 41 | |||
| 42 | - built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ] | ||
| 43 | + built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ] | ||
| 44 | foreach file : gtkmm_used_hg_ccg_basenames | ||
| 45 | - built_cc_files += src_untracked_gtkmm / file + '.cc' | ||
| 46 | + built_cc_files += '../..' / untracked_gtkmm / file + '.cc' | ||
| 47 | endforeach | ||
| 48 | |||
| 49 | gtk_gen_sources = built_cc_files | ||
| 50 | -- | ||
| 51 | 2.29.2 | ||
| 52 | |||
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb index f9ca7fd4b9..1648e37fa8 100644 --- a/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb +++ b/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb | |||
| @@ -16,6 +16,9 @@ inherit gnomebase features_check | |||
| 16 | 16 | ||
| 17 | REQUIRED_DISTRO_FEATURES = "x11" | 17 | REQUIRED_DISTRO_FEATURES = "x11" |
| 18 | 18 | ||
| 19 | SRC_URI += "file://0001-meson.build-use-relative-path.patch \ | ||
| 20 | " | ||
| 21 | |||
| 19 | SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" | 22 | SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" |
| 20 | 23 | ||
| 21 | EXTRA_OEMESON = "-Dbuild-demos=false" | 24 | EXTRA_OEMESON = "-Dbuild-demos=false" |
