[Buildroot] [PATCH 1/1] package/libselinux: fix glibc build with old toolchains

[Adam Duskett]

All;

Tested-by Adam Duskett <Aduskett at gmail.com>

On Mon, Apr 20, 2020 at 12:59 PM Fabrice Fontaine
<fontaine.fabrice at gmail.com> wrote:
>
> For an unknown reason, since bump to version 3.0.0, we got build failure
> due to -D_FILE_OFFSET_BITS==64:
>
> /home/naourr/work/instance-2/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/fts.h:41:3: error: #error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
>  # error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
>    ^
>
> Update our workaround to also filter CPPFLAGS fix the issue and seems
> right as we're doing it for all the other affected packages
> (restorecond, elfutils ...)
>
> Fixes:
>  - http://autobuild.buildroot.org/results/200fd0accf6a1926251243b05e600fbf591bb3a2
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  package/libselinux/libselinux.mk | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
> index b53146e30b..258065b79d 100644
> --- a/package/libselinux/libselinux.mk
> +++ b/package/libselinux/libselinux.mk
> @@ -45,12 +45,13 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS
>  endef
>  endif # python3
>
> -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc
> -# 2.22. We set CFLAGS and LDFLAGS here because we want to win over the
> -# CFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV)
> +# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We
> +# set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the
> +# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_DISTUTILS_ENV)
>  # when the python binding is enabled.
>  LIBSELINUX_MAKE_OPTS += \
>         CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \
> +       CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \
>         LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread"
>
>  define LIBSELINUX_BUILD_CMDS
> --
> 2.25.1
>