summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2021-05-21 16:55:24 +0800
committerKhem Raj <raj.khem@gmail.com>2021-05-21 06:47:58 -0700
commita6d1ddf7a9972008261bb84ff4196446d182c683 (patch)
tree59c4cac40ac278a726205bd887f8fdfbd5229a28 /meta-gnome
parentbdb9adbeb4a3cf2d38b5922e80e092608953a9fa (diff)
downloadmeta-openembedded-a6d1ddf7a9972008261bb84ff4196446d182c683.tar.gz
libgtop: fix do_compile error
On some distros, such as fedora32, cross compile failed with following error since host library is used. undefined reference to `stat64@GLIBC_2.33' According doc of ld, set searchdir begins with "=", but not hardcoded locations. Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch37
-rw-r--r--meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb2
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch
new file mode 100644
index 000000000..1bd6e101b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-fix-compile-error-for-cross-compile.patch
@@ -0,0 +1,37 @@
1From e865a93000913b4597607289356114cd159f4e28 Mon Sep 17 00:00:00 2001
2From: Your Name <you@example.com>
3Date: Fri, 21 May 2021 03:02:29 +0000
4Subject: [PATCH] fix compile error for cross compile
5
6On some distros, such as fedora32, cross compile failed with following
7error since host library is used. undefined reference to
8`stat64@GLIBC_2.33'
9
10According doc of ld, set searchdir begins with "=", but not hardcoded
11locations.
12
13Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libgtop/-/merge_requests/26]
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 configure.ac | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 472f44b..ed6a4d7 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -270,8 +270,8 @@ AC_ARG_ENABLE(fatal-warnings,
25 [Define to enable fatal warnings]))
26
27 dnl These definitions are expanded in make.
28-LIBGTOP_LIBS='-L$(libdir)'
29-LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
30+LIBGTOP_LIBS='-L=$(libdir)'
31+LIBGTOP_INCS='-I=$(includedir)/libgtop-2.0'
32
33 if test x$libgtop_have_sysinfo = xyes ; then
34 LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
35--
362.26.2
37
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
index 63615e433..6d9398f4e 100644
--- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb
@@ -8,6 +8,8 @@ inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-ver
8inherit features_check 8inherit features_check
9REQUIRED_DISTRO_FEATURES = "x11" 9REQUIRED_DISTRO_FEATURES = "x11"
10 10
11SRC_URI += "file://0001-fix-compile-error-for-cross-compile.patch"
12
11SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" 13SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4"
12 14
13DEPENDS = "glib-2.0 libxau" 15DEPENDS = "glib-2.0 libxau"