diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-09-01 09:55:24 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-09-01 10:55:23 -0700 |
| commit | 5a782fe1853cabf2634657d9f994cef86cf30f27 (patch) | |
| tree | eb86a12ae422d7e9372102624083cbe98652333f /meta-xfce/recipes-xfce | |
| parent | 6d9291c7e05fa230557d1fa92348a7774de6ff1b (diff) | |
| download | meta-openembedded-5a782fe1853cabf2634657d9f994cef86cf30f27.tar.gz | |
xfce4-dev-tools: Fix configure check for libX11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-xfce')
2 files changed, 38 insertions, 1 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch new file mode 100644 index 0000000000..43b1eb505a --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools/0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch @@ -0,0 +1,35 @@ +From 8f58e1b5c15fc3b6f775207971d078c058d9eb7b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Sep 2022 08:21:56 -0700 +Subject: [PATCH] m4macros: Check for a function provided by libX11 in + AC_CHECK_LIB + +checking for main is not ideal, since its not a function from libX11 +moreover with newer versions of autoconf this will start to fail [1], so +change this to use XFree API which is provided by libX11 and seems more +relevant to check here. + +[1] https://lists.gnu.org/archive/html/autoconf-patches/2022-08/msg00018.html + +Upstream-Status: Submitted [https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/issues/57] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4macros/xdt-depends.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4 +index 3c07c90..ce1b272 100644 +--- a/m4macros/xdt-depends.m4 ++++ b/m4macros/xdt-depends.m4 +@@ -213,7 +213,7 @@ AC_DEFUN([XDT_CHECK_LIBX11], + + LIBX11_CFLAGS= LIBX11_LDFLAGS= LIBX11_LIBS= + if test x"$no_x" != x"yes"; then +- AC_CHECK_LIB([X11], [main], ++ AC_CHECK_LIB([X11], [XFree], + [ + AC_DEFINE([HAVE_LIBX11], [1], [Define if libX11 is available]) + LIBX11_CFLAGS="$X_CFLAGS" +-- +2.37.3 + diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb index 5c41a76ed6..586a77efc6 100644 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb @@ -11,7 +11,9 @@ inherit autotools pkgconfig BBCLASSEXTEND = "native" -SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2 \ + file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ + " SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" SRC_URI[sha256sum] = "f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04" |