From 2369ac2a089e1afaf61753ee1d4bc08b80c1ace7 Mon Sep 17 00:00:00 2001 From: native-api Date: Tue, 10 Jan 2023 01:13:09 +0300 Subject: [PATCH] Fix using dependencies from Ports in BSD with no pkg-config (#2586) --- plugins/python-build/bin/python-build | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 97b86fde..c5815da4 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1416,20 +1416,17 @@ use_freebsd_pkg() { if [ "FreeBSD" = "$(uname -s)" ]; then # use openssl if installed from Ports Collection if [ -f /usr/local/include/openssl/ssl.h ]; then - package_option ruby configure --with-openssl-dir="/usr/local" + package_option python configure --with-openssl="/usr/local" fi # check if 11-R or later release="$(uname -r)" if [ "${release%%.*}" -ge 11 ]; then - # prefers readline to compile most of ruby versions - if pkg info -e readline > /dev/null; then + if pkg info -e readline > /dev/null && ! command -v pkg-config > /dev/null ; then # use readline from Ports Collection - package_option ruby configure --with-readline-dir="/usr/local" - elif pkg info -e libedit > /dev/null; then - # use libedit from Ports Collection - package_option ruby configure --enable-libedit - package_option ruby configure --with-libedit-dir="/usr/local" + # unlike Linux, BSD's cc does not look in /usr/local by default + export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS% } }-I/usr/local/include" + export LDFLAGS="${LDFLAGS:+${LDFLAGS% } }-L/usr/local/lib -Wl,-rpath,/usr/local/lib" fi fi fi