@@ -57,8 +57,8 @@ test-extras = ["test"]
5757# Linux build configuration
5858[tool .cibuildwheel .linux ]
5959# Use manylinux_2_28 (Debian 12 / Bookworm based)
60- manylinux-x86_64-image = " manylinux_2_28_x86_64"
61- manylinux-aarch64-image = " manylinux_2_28_aarch64"
60+ manylinux-x86_64-image = " quay.io/pypa/ manylinux_2_28_x86_64"
61+ manylinux-aarch64-image = " quay.io/pypa/ manylinux_2_28_aarch64"
6262
6363# Install system dependencies before build
6464before-all = """
@@ -78,13 +78,23 @@ before-all = """
7878archs = [" x86_64" , " arm64" ]
7979
8080# Install dependencies via Homebrew (run once before all builds)
81- before-all = " brew install mapnik icu4c pkg-config boost gdal proj harfbuzz"
81+ before-all = " brew install mapnik icu4c pkg-config boost gdal proj harfbuzz libx11 xorgproto libxext libxrender libxau libxdmcp "
8282
8383# Set environment variables for each build
8484# These are exported in the build environment
8585before-build = """
8686 eval $(brew shellenv)
87- export PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig:$(brew --prefix)/opt/icu4c/lib/pkgconfig:$(brew --prefix)/opt/boost/lib/pkgconfig:$(brew --prefix)/opt/gdal/lib/pkgconfig:$(brew --prefix)/opt/proj/lib/pkgconfig:$(brew --prefix)/opt/harfbuzz/lib/pkgconfig:$PKG_CONFIG_PATH
88- export CXXFLAGS="-I$(brew --prefix)/opt/boost/include -I$(brew --prefix)/opt/gdal/include -I$(brew --prefix)/opt/proj/include -I$(brew --prefix)/opt/harfbuzz/include $CXXFLAGS"
89- export LDFLAGS="-L$(brew --prefix)/opt/boost/lib -L$(brew --prefix)/opt/gdal/lib -L$(brew --prefix)/opt/proj/lib -L$(brew --prefix)/opt/harfbuzz/lib $LDFLAGS"
87+ HOMEBREW_PREFIX=$(brew --prefix)
88+ ICU4C_PREFIX=$(brew --prefix icu4c)
89+ BOOST_PREFIX=$(brew --prefix boost)
90+ GDAL_PREFIX=$(brew --prefix gdal)
91+ PROJ_PREFIX=$(brew --prefix proj)
92+ HARFBUZZ_PREFIX=$(brew --prefix harfbuzz)
93+ XORGPROTO_PREFIX=$(brew --prefix xorgproto)
94+ # Find xorgproto pkg-config directory (may be versioned in Cellar)
95+ XORGPROTO_PKGCONFIG_DIR=$(find "$HOMEBREW_PREFIX/Cellar/xorgproto" -type d -name "pkgconfig" 2>/dev/null | head -1)
96+ [ -z "$XORGPROTO_PKGCONFIG_DIR" ] && XORGPROTO_PKGCONFIG_DIR="$XORGPROTO_PREFIX/share/pkgconfig"
97+ export PKG_CONFIG_PATH="$HOMEBREW_PREFIX/lib/pkgconfig:$HOMEBREW_PREFIX/share/pkgconfig:$ICU4C_PREFIX/lib/pkgconfig:$GDAL_PREFIX/lib/pkgconfig:$PROJ_PREFIX/lib/pkgconfig:$HARFBUZZ_PREFIX/lib/pkgconfig:$XORGPROTO_PKGCONFIG_DIR:$XORGPROTO_PREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
98+ export CXXFLAGS="-I$BOOST_PREFIX/include -I$GDAL_PREFIX/include -I$PROJ_PREFIX/include -I$HARFBUZZ_PREFIX/include $CXXFLAGS"
99+ export LDFLAGS="-L$BOOST_PREFIX/lib -L$GDAL_PREFIX/lib -L$PROJ_PREFIX/lib -L$HARFBUZZ_PREFIX/lib $LDFLAGS"
90100"""
0 commit comments