소스 검색

Add flags for Homebrew into `python-config --ldflags` (#2384)

pull/2386/head
native-api 2 년 전
committed by GitHub
부모
커밋
bc13a87bee
No known key found for this signature in database GPG 키 ID: 4AEE18F83AFDEB23
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. +5
    -2
      plugins/python-build/bin/python-build
  2. +1
    -1
      plugins/python-build/test/build.bats

+ 5
- 2
plugins/python-build/bin/python-build 파일 보기

@ -1300,7 +1300,7 @@ require_osx_version() {
configured_with_package_dir() {
local package_var_name="$(capitalize "$1")"
shift 1
shift 3
local PACKAGE_CONFIGURE_OPTS="${package_var_name}_CONFIGURE_OPTS"
local PACKAGE_CONFIGURE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
local arg flag
@ -1330,7 +1330,10 @@ use_homebrew() {
# /usr/local/lib:/usr/lib is the default library search path
if [[ -n $brew_prefix && $brew_prefix != "/usr" && $brew_prefix != "/usr/local" ]]; then
export CPPFLAGS="${CPPFLAGS:+${CPPFLAGS% } }-I${brew_prefix}/include"
export LDFLAGS="${LDFLAGS:+${LDFLAGS% } }-L${brew_prefix}/lib"
export LDFLAGS="${LDFLAGS:+${LDFLAGS% } }-L${brew_prefix}/lib -Wl,-rpath,${brew_prefix}/lib"
# `python-config` ignores LDFLAGS envvar. Adding to LIBS is the only way to add extra stuff
# to `python-config --ldflags` output
export LIBS="${LIBS:+${LIBS% } }-L${brew_prefix}/lib -Wl,-rpath,${brew_prefix}/lib"
fi
fi
}

+ 1
- 1
plugins/python-build/test/build.bats 파일 보기

@ -166,7 +166,7 @@ DEF
unstub make
assert_build_log <<OUT
Python-3.6.2: CPPFLAGS="-I${TMP}/install/include -I$BREW_PREFIX/include" LDFLAGS="-L${TMP}/install/lib -L$BREW_PREFIX/lib"
Python-3.6.2: CPPFLAGS="-I${TMP}/install/include -I$BREW_PREFIX/include" LDFLAGS="-L${TMP}/install/lib -L$BREW_PREFIX/lib -Wl,-rpath,$BREW_PREFIX/lib"
Python-3.6.2: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
make -j 2
make install

불러오는 중...
취소
저장