Skip to content

Commit

Permalink
Same build directions everywhere?
Browse files Browse the repository at this point in the history
  • Loading branch information
jbarlow83 committed May 12, 2024
1 parent c250a53 commit b7f1ef8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
env:
CIBW_BUILD: "*"
CIBW_TEST_SKIP: "cp38-macosx_*:arm64" # cibuildwheel cannot test Python 3.8 on ARM64

strategy:
matrix:
os: [macos-13, macos-14] # macos-13 is an intel runner, macos-14 is apple silicon
Expand Down
10 changes: 2 additions & 8 deletions build-scripts/posix-build-wheel-deps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ if [ "$arch" == "aarch64" -o "$arch" == "arm64" ]; then
max_jobs=3
fi

if [ "$os" == "Darwin" ]; then
# Setting MACOSX_DEPLOYMENT_TARGET here affects the QPDF build,
# not the pikepdf, since this script runs in different process
# from that build.
# See docs/references/build.rst for why we do this.
export MACOSX_DEPLOYMENT_TARGET="11.0"
fi

maybe_sudo () {
if [ "$os" == "Darwin" ]; then
sudo -E "$@"
Expand All @@ -28,6 +20,8 @@ maybe_sudo () {
fi
}

echo "Building dependencies for $os $arch MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"

if [ ! -f /usr/local/lib/libqpdf.so -a ! -f /usr/local/lib/libqpdf.dylib ]; then
pushd qpdf
if [ "$os" == "Darwin" ]; then
Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ build-frontend = "build"
QPDF_MIN_VERSION = "11.5.0"
QPDF_VERSION = "11.9.0"
QPDF_PATTERN = "https://github.com/qpdf/qpdf/releases/download/vVERSION/qpdf-VERSION.tar.gz"
MACOSX_DEPLOYMENT_TARGET = "11.0"

[tool.cibuildwheel.linux]
before-all = [
Expand Down Expand Up @@ -171,9 +170,7 @@ before-all = [
"bash build-scripts/posix-download-qpdf.bash $QPDF_VERSION",
"bash build-scripts/posix-build-wheel-deps.bash",
] # Use 'brew whatever || true' workaround until https://github.com/actions/setup-python/issues/577 is fixed
before-build = [
'export MACOSX_DEPLOYMENT_TARGET="11.0"',
] # Ensure each build is targeting 11.0 when we are on arm64. See docs/references/build.rst
environment = { MACOSX_DEPLOYMENT_TARGET = "11.0", SYSTEM_VERSION_COMPAT = 0 }

[tool.cibuildwheel.windows]

Expand Down

0 comments on commit b7f1ef8

Please sign in to comment.