From 6e7cf978544ada9114e780df3564509095dbe2cc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 9 Mar 2023 16:19:42 +0100 Subject: util-macros: do not probe into host triplet when checking manpage section names This does not work for allarch recipes in particular (config.sub rejects allarch-poky-linux). (From OE-Core rev: f41be046ff26ecbbab9342ee62dbf39df4596da7) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ....m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch | 28 ++++++++++++++++++++++ .../xorg-util/util-macros_1.20.0.bb | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch (limited to 'meta/recipes-graphics/xorg-util') diff --git a/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch b/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch new file mode 100644 index 0000000000..e08b586bf0 --- /dev/null +++ b/meta/recipes-graphics/xorg-util/util-macros/0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch @@ -0,0 +1,28 @@ +From 6afaaf164ab9370204856961a92ad8ee523a8293 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 3 Mar 2023 13:24:58 +0100 +Subject: [PATCH] xorg-macros.m4.in: do not run AC_CANONICAL_HOST in manpage + section macro + +This doesn't work when building allarch items, as it calls into +config.sub with the host triplet, and config.sub can't match +it against any architeture it knows. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Alexander Kanavin +--- + xorg-macros.m4.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in +index 3b8b8e9..6541236 100644 +--- a/xorg-macros.m4.in ++++ b/xorg-macros.m4.in +@@ -111,7 +111,6 @@ AC_SUBST(TRADITIONALCPPFLAGS) + # Added AC_PROG_SED in version 1.8 + + AC_DEFUN([XORG_MANPAGE_SECTIONS],[ +-AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_PROG_SED]) + + case $host_os in diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb index 60495ad0c8..cd4bc387a2 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42ba50748cb7ccf8739424e5e2072b02" PE = "1" +SRC_URI += "file://0001-xorg-macros.m4.in-do-not-run-AC_CANONICAL_HOST-in-ma.patch" + SRC_URI[sha256sum] = "8daf36913d551a90fd1013cb078401375dabae021cb4713b9b256a70f00eeb74" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies -- cgit v1.2.3-54-g00ecf