Skip to content

Keep the native prefix in front of PATH #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Keep the native prefix in front of PATH #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da07a1c
Keep the native prefix in front of PATH
isuruf Feb 4, 2023
20bc205
Fix build_libjpeg_turbo
isuruf Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library_builders.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function build_libjpeg_turbo {
local cmake=$(get_modern_cmake)
fetch_unpack https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${JPEGTURBO_VERSION}.tar.gz
(cd libjpeg-turbo-${JPEGTURBO_VERSION} \
&& $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib . \
&& $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib . \
&& make install)

# Prevent build_jpeg
Expand Down
2 changes: 2 additions & 0 deletions osx_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ function macos_intel_cross_build_setup {
function macos_arm64_cross_build_setup {
# Setup cross build for single arch arm_64 wheels
export PLAT="arm64"
export NATIVE_PREFIX=$BUILD_PREFIX
export BUILD_PREFIX=/opt/arm64-builds
sudo mkdir -p $BUILD_PREFIX/lib $BUILD_PREFIX/include
sudo chown -R $USER $BUILD_PREFIX
Expand All @@ -492,6 +493,7 @@ function macos_arm64_cross_build_setup {
export MACOSX_DEPLOYMENT_TARGET="11.0"
export CROSS_COMPILING=1
export LDFLAGS+=" -arch arm64 -L$BUILD_PREFIX/lib -Wl,-rpath,$BUILD_PREFIX/lib ${FC_ARM64_LDFLAGS:-}"
export PATH="$NATIVE_PREFIX/bin:$PATH"
# This would automatically let autoconf know that we are cross compiling for arm64 darwin
export host_alias="aarch64-apple-darwin20.0.0"
}
Expand Down