From f52180899f500f01a6dfb3b35b294003ad9f9d73 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 11 Apr 2025 08:54:37 -0600 Subject: [PATCH] Support dynamic linking in pkg-config wrapper --- bin/aarch64-unknown-redox-pkg-config | 7 ++++++- bin/i686-unknown-redox-pkg-config | 7 ++++++- bin/riscv64-unknown-redox-pkg-config | 7 ++++++- bin/x86_64-unknown-redox-pkg-config | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/bin/aarch64-unknown-redox-pkg-config b/bin/aarch64-unknown-redox-pkg-config index 0bcf777b9..57774042b 100755 --- a/bin/aarch64-unknown-redox-pkg-config +++ b/bin/aarch64-unknown-redox-pkg-config @@ -4,4 +4,9 @@ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig" -exec pkg-config --static "$@" +if [ -n "${COOKBOOK_PREFER_STATIC}" ] +then + exec pkg-config --static "$@" +else + exec pkg-config "$@" +fi diff --git a/bin/i686-unknown-redox-pkg-config b/bin/i686-unknown-redox-pkg-config index 0bcf777b9..57774042b 100755 --- a/bin/i686-unknown-redox-pkg-config +++ b/bin/i686-unknown-redox-pkg-config @@ -4,4 +4,9 @@ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig" -exec pkg-config --static "$@" +if [ -n "${COOKBOOK_PREFER_STATIC}" ] +then + exec pkg-config --static "$@" +else + exec pkg-config "$@" +fi diff --git a/bin/riscv64-unknown-redox-pkg-config b/bin/riscv64-unknown-redox-pkg-config index 0bcf777b9..57774042b 100755 --- a/bin/riscv64-unknown-redox-pkg-config +++ b/bin/riscv64-unknown-redox-pkg-config @@ -4,4 +4,9 @@ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig" -exec pkg-config --static "$@" +if [ -n "${COOKBOOK_PREFER_STATIC}" ] +then + exec pkg-config --static "$@" +else + exec pkg-config "$@" +fi diff --git a/bin/x86_64-unknown-redox-pkg-config b/bin/x86_64-unknown-redox-pkg-config index 0bcf777b9..57774042b 100755 --- a/bin/x86_64-unknown-redox-pkg-config +++ b/bin/x86_64-unknown-redox-pkg-config @@ -4,4 +4,9 @@ export PKG_CONFIG_SYSROOT_DIR="${COOKBOOK_SYSROOT}" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig" export PKG_CONFIG_PATH="${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig" -exec pkg-config --static "$@" +if [ -n "${COOKBOOK_PREFER_STATIC}" ] +then + exec pkg-config --static "$@" +else + exec pkg-config "$@" +fi