From aae308a3354bb3d0ae0bdf8647ce9be8e46abbce Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 19 Sep 2020 15:08:43 +0200 Subject: [PATCH] Fix recognition of musl libc on Alpine Linux 3.10. Reported by Jeffrey Walton in . * m4/musl.m4 (gl_MUSL_CANONICAL_HOST): New macro. (gl_MUSL_LIBC): Require it. * m4/setlocale_null.m4 (gl_FUNC_SETLOCALE_NULL): Likewise. * modules/setlocale-null (Files): Add m4/musl.m4. --- ChangeLog | 10 ++++++++++ m4/musl.m4 | 34 ++++++++++++++++++++++++++++++++-- m4/setlocale_null.m4 | 4 ++-- modules/setlocale-null | 1 + 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1aa1acc583..ebaa5fb2af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2020-09-19 Bruno Haible + + Fix recognition of musl libc on Alpine Linux 3.10. + Reported by Jeffrey Walton in + . + * m4/musl.m4 (gl_MUSL_CANONICAL_HOST): New macro. + (gl_MUSL_LIBC): Require it. + * m4/setlocale_null.m4 (gl_FUNC_SETLOCALE_NULL): Likewise. + * modules/setlocale-null (Files): Add m4/musl.m4. + 2020-09-19 Bruno Haible nl_langinfo: Make multithread-safe on Solaris 10 and Solaris 11.3. diff --git a/m4/musl.m4 b/m4/musl.m4 index 252054c99b..343c71a7ce 100644 --- a/m4/musl.m4 +++ b/m4/musl.m4 @@ -1,4 +1,4 @@ -# musl.m4 serial 1 +# musl.m4 serial 2 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,10 +9,40 @@ dnl with or without modifications, as long as this notice is preserved. # . # From Bruno Haible. +# There are three ways to test for musl libc: +# a. Look at the 'ldd --version' output. This is how config.guess +# does it. But it fails on Alpine Linux 3.10, because on this system +# 'ldd' is a shell script that does not understand the '--version' +# option. +# b. Test whether the header file exists. +# c. Test whether the header file defines the macro +# __DEFINED_va_list. +# We use a+c. + AC_DEFUN_ONCE([gl_MUSL_LIBC], [ - AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_MUSL_CANONICAL_HOST]) case "$host_os" in *-musl*) AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.]) ;; esac ]) + +# Like AC_CANONICAL_HOST, except for a fix regarding Alpine Linux 3.10. + +AC_DEFUN([gl_MUSL_CANONICAL_HOST], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "$host_os" in + linux*-gnu*) + AC_EGREP_CPP([actually_musl], + [#include + #ifdef __DEFINED_va_list + actually_musl + #endif + ], + [host=`echo "$host" | sed -e 's/gnu.*/musl/'` + host_os=`echo "$host_os" | sed -e 's/gnu.*/musl/'` + ]) + ;; + esac +]) diff --git a/m4/setlocale_null.m4 b/m4/setlocale_null.m4 index c1ee1f799e..20c5c99cc0 100644 --- a/m4/setlocale_null.m4 +++ b/m4/setlocale_null.m4 @@ -1,4 +1,4 @@ -# setlocale_null.m4 serial 2 +# setlocale_null.m4 serial 3 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SETLOCALE_NULL], [ - AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_MUSL_CANONICAL_HOST]) AC_REQUIRE([gl_PTHREADLIB]) AC_CHECK_HEADERS_ONCE([threads.h]) diff --git a/modules/setlocale-null b/modules/setlocale-null index 2774004ff1..d8c57a240e 100644 --- a/modules/setlocale-null +++ b/modules/setlocale-null @@ -7,6 +7,7 @@ lib/setlocale_null.c lib/setlocale-lock.c lib/windows-initguard.h m4/setlocale_null.m4 +m4/musl.m4 m4/threadlib.m4 m4/visibility.m4 -- 2.39.5