Просмотр исходного кода

Fix using dependencies from Ports in BSD with no pkg-config (#2586)

pull/2590/head
native-api 3 лет назад
committed by GitHub
Родитель
Сommit
2369ac2a08
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 4AEE18F83AFDEB23
1 измененных файлов: 5 добавлений и 8 удалений
  1. +5
    -8
      plugins/python-build/bin/python-build

+ 5
- 8
plugins/python-build/bin/python-build Просмотреть файл

@ -1416,20 +1416,17 @@ use_freebsd_pkg() {
if [ "FreeBSD" = "$(uname -s)" ]; then if [ "FreeBSD" = "$(uname -s)" ]; then
# use openssl if installed from Ports Collection # use openssl if installed from Ports Collection
if [ -f /usr/local/include/openssl/ssl.h ]; then 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 fi
# check if 11-R or later # check if 11-R or later
release="$(uname -r)" release="$(uname -r)"
if [ "${release%%.*}" -ge 11 ]; then 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 # 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 fi
fi fi

Загрузка…
Отмена
Сохранить