From 02aeb779bdb285748a4a49ffb43f52d8ff17877f Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sun, 26 Dec 2021 15:07:21 +0000 Subject: [PATCH] ALL: Add share folder to pkg-config search path As giflib used this variable to determine the library path, use another way --- toolchains/common/packages/giflib/build.sh | 14 +++++++++++++- toolchains/m4/paths.m4 | 4 ++-- workers/m4/paths.m4 | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/toolchains/common/packages/giflib/build.sh b/toolchains/common/packages/giflib/build.sh index 13b861d..31f03a5 100755 --- a/toolchains/common/packages/giflib/build.sh +++ b/toolchains/common/packages/giflib/build.sh @@ -14,6 +14,18 @@ sed -i -e 's/-Wno-format-truncation //' Makefile do_make libgif.a OFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" do_make install-include PREFIX=${PREFIX} -install -m 644 libgif.a "${LIBDIR:-${PKG_CONFIG_LIBDIR:-${PREFIX}/lib/pkgconfig}/..}/libgif.a" + +# Find the libc and install libgif next to it +if [ -z "${LIBDIR}" ]; then + LIBDIR=$(dirname "$("$CC" -print-file-name="libc.a")") + if [ "$LIBDIR" = . ]; then + LIBDIR= + fi +fi +if [ -z "${LIBDIR}" ]; then + LIBDIR=${PREFIX}/lib +fi + +install -m 644 libgif.a "${DESTDIR}${LIBDIR}/libgif.a" do_clean_bdir diff --git a/toolchains/m4/paths.m4 b/toolchains/m4/paths.m4 index 6e2aaff..b86c387 100644 --- a/toolchains/m4/paths.m4 +++ b/toolchains/m4/paths.m4 @@ -2,8 +2,8 @@ m4_divert(`-1') m4_define(`def_binaries', `m4_foreachq(`binary', `$2',`environmentalize(binary)=`$1'binary ')') -m4_define(`def_aclocal', `ACLOCAL_PATH=`$1'/share/aclocal') -m4_define(`def_pkg_config', `PKG_CONFIG_LIBDIR=`$1'/lib/pkgconfig') +m4_define(`def_aclocal', `ACLOCAL_PATH="`$1'/share/aclocal"') +m4_define(`def_pkg_config', `PKG_CONFIG_LIBDIR="`$1'/lib/pkgconfig:`$1'/share/pkgconfig"') m4_define(`crossgen', ``COPY --from=helpers /lib-helpers/meson-crossgen lib-helpers/meson-crossgen'' RUN $4 ``lib-helpers/meson-crossgen'' -o /usr/local/share/meson/cross/cross.ini --system=$1 --cpu=$2 $3) diff --git a/workers/m4/paths.m4 b/workers/m4/paths.m4 index 95423fd..873874a 100644 --- a/workers/m4/paths.m4 +++ b/workers/m4/paths.m4 @@ -2,7 +2,7 @@ m4_divert(`-1') m4_define(`def_binaries', `m4_foreachq(`binary', `$2',`environmentalize(binary)=`$1'binary ')') -m4_define(`def_aclocal', `ACLOCAL_PATH=`$1'/share/aclocal') -m4_define(`def_pkg_config', `PKG_CONFIG_LIBDIR=`$1'/lib/pkgconfig') +m4_define(`def_aclocal', `ACLOCAL_PATH="`$1'/share/aclocal"') +m4_define(`def_pkg_config', `PKG_CONFIG_LIBDIR="`$1'/lib/pkgconfig:`$1'/share/pkgconfig"') m4_divert`'m4_dnl