From 544d8ee19b5ac74a841722a3e000019d2e6ab4f8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 22 Jan 2025 15:28:17 +0000 Subject: [PATCH] man-db: fix broken requirement for flex Normally flex-native in the sysroot via the toolchain, but different toolchains may not depend on flex-native (eg, external-arm-toolchain). This results in a configure error: checking for flex... no configure: error: flex is required when building from revision control Now we're not building from revision control, but the configure script is broken with out-of-tree builds and checks the (empty) build tree for pre-generated sources. Apply a fix to look in the source tree instead. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Ross Burton --- meta/recipes-extended/man-db/files/flex.patch | 36 +++++++++++++++++++ meta/recipes-extended/man-db/man-db_2.13.0.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-extended/man-db/files/flex.patch diff --git a/meta/recipes-extended/man-db/files/flex.patch b/meta/recipes-extended/man-db/files/flex.patch new file mode 100644 index 00000000000..c18be7e36ae --- /dev/null +++ b/meta/recipes-extended/man-db/files/flex.patch @@ -0,0 +1,36 @@ +From d3f7c160bddf5d879c74e19e4f577882e8b22559 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Wed, 22 Jan 2025 14:16:48 +0000 +Subject: [PATCH] configure: check for shipped generated sources in source + directory + +The configure script fails if it can't find flex and the pregenerated +source code isn't available, as is the case in builds from git whereas +tarballs include the code. + +However this breaks with out-of-tree builds, where cwd during configure +is the build directory not the source directory, and the pregenerated +sources will always be inside the source directory. + +Upstream-Status: Submitted [https://gitlab.com/man-db/man-db/-/merge_requests/12] +Signed-off-by: Ross Burton +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7e9148fb..49a213fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -380,7 +380,7 @@ dnl To add more decompressors just follow the scheme above. + dnl The "noyywrap" argument is new in Autoconf 2.70, but this also works + dnl fine with older versions that ignore the argument. + AC_PROG_LEX([noyywrap]) +-if test "$LEX" = ":" && (test ! -e src/lexgrog.c || test ! -e src/zsoelim.c) ++if test "$LEX" = ":" && (test ! -e $srcdir/src/lexgrog.c || test ! -e $srcdir/src/zsoelim.c) + then + AC_MSG_ERROR([flex is required when building from revision control]) + fi +-- +2.43.0 + diff --git a/meta/recipes-extended/man-db/man-db_2.13.0.bb b/meta/recipes-extended/man-db/man-db_2.13.0.bb index 2fa18a8f24f..2178239bb60 100644 --- a/meta/recipes-extended/man-db/man-db_2.13.0.bb +++ b/meta/recipes-extended/man-db/man-db_2.13.0.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ " SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ + file://flex.patch \ file://99_mandb \ " SRC_URI[sha256sum] = "82f0739f4f61aab5eb937d234de3b014e777b5538a28cbd31433c45ae09aefb9" -- 2.47.3