ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: Add share folder to pkg-config search path

Browse Source 
As giflib used this variable to determine the library path, use another
way
This commit is contained in:
Le Philousophe
2021-12-26 15:07:21 +00:00
parent 89eb7682d3
commit 02aeb779bd
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/common/packages/giflib/build.sh
+13 -1
View File
@@ -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
toolchains/m4/paths.m4
+2 -2
View File
@@ -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)
workers/m4/paths.m4
+2 -2
View File
@@ -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