Skip to content

Commit 517b72f

Browse files
committed
Make updates needed for mac 14 arm64
1 parent 548fb0e commit 517b72f

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

buildconfig/macdependencies/clean_usr_local.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
# First clean up some homebrew stuff we don't want linked in
55
# ----------------------------------------------------------
66

7-
rm -rf /usr/local/bin/curl
8-
rm -rf /usr/local/opt/curl
9-
rm -rf /usr/local/bin/git
10-
rm -rf /usr/local/opt/git
7+
rm -rf /usr/local/bin/curl /usr/local/opt/curl /opt/homebrew/bin/curl
8+
rm -rf /usr/local/bin/git /usr/local/opt/git /opt/homebrew/bin/git
119
# Use the apple provided curl, and git.
1210
# The homebrew ones depend on libs we don't want to include.
1311
# ln -s /usr/bin/curl /usr/local/bin/curl
1412
ln -s /usr/bin/git /usr/local/bin/git
13+
ln -s /usr/bin/git /opt/homebrew/bin/git
1514

1615
rm -rf /usr/local/lib/libtiff*
1716
rm -rf /usr/local/lib/libzstd*
@@ -23,16 +22,17 @@ rm -rf /usr/local/lib/libgthread*
2322
rm -rf /usr/local/lib/libintl*
2423
rm -rf /usr/local/lib/libbrotlidec*
2524
rm -rf /usr/local/lib/libopus*
26-
rm -rf /usr/local/opt/freetype
25+
rm -rf /usr/local/lib/freetype*
26+
rm -rf /usr/local/opt/freetype*
2727

28-
rm -rf /usr/local/Cellar/libtiff
29-
rm -rf /usr/local/Cellar/libsndfile
30-
rm -rf /usr/local/Cellar/glib
31-
rm -rf /usr/local/Cellar/brotli
32-
rm -rf /usr/local/Cellar/pcre*
33-
rm -rf /usr/local/Cellar/opusfile
34-
rm -rf /usr/local/Cellar/opus
35-
rm -rf /usr/local/Cellar/freetype
28+
rm -rf /usr/local/Cellar/libtiff /opt/homebrew/Cellar/libtiff
29+
rm -rf /usr/local/Cellar/libsndfile /opt/homebrew/Cellar/libsndfile
30+
rm -rf /usr/local/Cellar/glib /opt/homebrew/Cellar/glib
31+
rm -rf /usr/local/Cellar/brotli /opt/homebrew/Cellar/brotli
32+
rm -rf /usr/local/Cellar/pcre* /opt/homebrew/Cellar/pcre*
33+
rm -rf /usr/local/Cellar/opusfile /opt/homebrew/Cellar/opusfile
34+
rm -rf /usr/local/Cellar/opus /opt/homebrew/Cellar/opus
35+
rm -rf /usr/local/Cellar/freetype* /opt/homebrew/Cellar/freetype*
3636

3737
rm -rf /usr/local/share/doc/tiff-*
3838
rm -rf /usr/local/share/doc/libsndfile

buildconfig/manylinux-build/docker_base/buildtools/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ cd $(dirname `readlink -f "$0"`)
1010
# separate build script for it
1111

1212
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
13-
export PG_LINUX_EXTRA_FLAGS="--user"
13+
export PG_PIP_EXTRA_FLAGS="--user"
14+
elif [[ "$OSTYPE" == "darwin"* ]]; then
15+
export PG_PIP_EXTRA_FLAGS="--break-system-packages"
1416
fi
1517

1618
# pin versions for stability (remember to keep updated)
17-
python3 -m pip install $PG_LINUX_EXTRA_FLAGS \
19+
python3 -m pip install $PG_PIP_EXTRA_FLAGS \
1820
setuptools==68.2.2 cmake==3.27.6 meson==1.2.2 ninja==1.11.1
1921

2022
if [[ "$OSTYPE" == "linux-gnu"* ]]; then

buildconfig/manylinux-build/docker_base/glib/build-glib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tar xf ${GLIB}.tar
1515
cd $GLIB
1616

1717
# a minimal glib install will do for us
18-
meson setup _build $PG_BASE_MESON_FLAGS -Dtests=false \
18+
meson setup _build $PG_BASE_MESON_FLAGS --force-fallback-for libpcre2-8 -Dtests=false \
1919
-Dselinux=disabled -Dlibmount=disabled -Ddtrace=false -Dsystemtap=false -Dnls=disabled
2020

2121
meson compile -C _build

0 commit comments

Comments
 (0)