diff options
| author | Chris Packham <judge.packham@gmail.com> | 2025-06-02 11:51:12 +1200 |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2025-06-04 09:23:45 +1200 |
| commit | f1c585edd01640dd267197cae6fd66465eace9bb (patch) | |
| tree | e6de80b3fb445eb76a90c55c13ce2e9def741019 | |
| parent | 61c87043d681c7469f5edce06d4a16623bfa5e70 (diff) | |
| download | crosstool-ng-f1c585edd01640dd267197cae6fd66465eace9bb.tar.gz crosstool-ng-f1c585edd01640dd267197cae6fd66465eace9bb.tar.bz2 crosstool-ng-f1c585edd01640dd267197cae6fd66465eace9bb.zip | |
libc/glibc: Add workaround for makeinfo build issue
Newer versions of makeinfo fail to build the older versions of the glibc
manual triggering build failures. Add a workaround for this my disabling
makeinfo for the glibc build where needed.
Fixes #2358
Signed-off-by: Chris Packham <judge.packham@gmail.com>
| -rw-r--r-- | config/libc/glibc.in | 6 | ||||
| -rw-r--r-- | scripts/build/libc/glibc.sh | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 28e4004c..a34c4209 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -289,6 +289,12 @@ comment "| Building GLIBC locales requires that GLIBC supports " comment "| the build machine as the target. " endif # LIBC_GLIBC && GLIBC_LOCALES +# Older Glibc versions are incompatible with newer makeinfo versions. Skip +# building the user manual if needed. +config GLIBC_MAKEINFO_WORKAROUND + def_bool y + depends on GLIBC_2_23_or_older + if KERNEL_LINUX choice GLIBC_SUPPORTED_KERNEL diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 34da4cfe..043660c1 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -182,6 +182,10 @@ glibc_backend_once() # or even after they get installed... echo "ac_cv_path_BASH_SHELL=/bin/bash" >>config.cache + if [ "${CT_GLIBC_MAKEINFO_WORKAROUND}" = "y" ]; then + echo "ac_cv_prog_MAKEINFO=" >>config.cache + fi + CT_SymlinkToolsMultilib # Configure with --prefix the way we want it on the target... |