Skip to content

Commit f8e13b3

Browse files
committed
#22: % update build-cross-platform.yml2
1 parent fed66c8 commit f8e13b3

File tree

1 file changed

+10
-44
lines changed

1 file changed

+10
-44
lines changed

.github/workflows/build-cross-platform.yml

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ jobs:
126126
- name: Install build dependencies (macOS)
127127
if: matrix.os == 'macos-latest'
128128
run: |
129+
# Update Homebrew first
130+
brew update
131+
129132
# Core build tools
130133
brew install autoconf automake libtool pkg-config bison
131134
@@ -137,16 +140,14 @@ jobs:
137140
libuv_version=$(pkg-config --modversion libuv 2>/dev/null || echo "unknown")
138141
echo "Installed LibUV version: $libuv_version"
139142
140-
# Fixed package names
141-
brew install tidy-html5 icu4c openssl@3
142-
143-
# Additional dependencies
144-
brew install gmp libzip bzip2 sqlite oniguruma curl
145-
brew install libxml2 libxslt readline libsodium argon2
143+
# Essential dependencies only (avoid conflicts)
144+
brew install tidy-html5 icu4c openssl@3 libxml2 libxslt
146145
147146
# Setup environment variables for keg-only packages
148-
echo "PKG_CONFIG_PATH=$(brew --prefix openssl@3)/lib/pkgconfig:$(brew --prefix icu4c)/lib/pkgconfig:$(brew --prefix libxml2)/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
147+
echo "PKG_CONFIG_PATH=$(brew --prefix openssl@3)/lib/pkgconfig:$(brew --prefix icu4c)/lib/pkgconfig:$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix libxslt)/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
149148
echo "PATH=$(brew --prefix bison)/bin:$PATH" >> $GITHUB_ENV
149+
echo "CPPFLAGS=-I$(brew --prefix openssl@3)/include -I$(brew --prefix icu4c)/include" >> $GITHUB_ENV
150+
echo "LDFLAGS=-L$(brew --prefix openssl@3)/lib -L$(brew --prefix icu4c)/lib" >> $GITHUB_ENV
150151
151152
# ==================== UBUNTU CONFIGURE & BUILD ====================
152153
- name: Configure PHP (Ubuntu)
@@ -155,7 +156,6 @@ jobs:
155156
run: |
156157
./buildconf -f
157158
./configure \
158-
--host=$(./build/config.guess) \
159159
--enable-zts \
160160
--enable-fpm \
161161
--enable-opcache \
@@ -224,7 +224,7 @@ jobs:
224224
if: matrix.os == 'windows-latest'
225225
working-directory: php-src
226226
run: |
227-
# Use php-sdk for environment setup and build
227+
REM Use php-sdk for environment setup and build
228228
call C:\php-sdk\bin\phpsdk_buildtree.bat phpdev
229229
call C:\php-sdk\bin\phpsdk_setvars.bat
230230
buildconf.bat
@@ -239,48 +239,14 @@ jobs:
239239
run: |
240240
./buildconf -f
241241
./configure \
242-
--host=$(./build/config.guess) \
243242
--enable-zts \
244-
--enable-fpm \
245243
--enable-opcache \
246244
--with-pdo-sqlite \
247245
--enable-intl \
248246
--without-pear \
249-
--with-zip \
250-
--with-zlib \
251-
--enable-soap \
252-
--enable-xmlreader \
253-
--with-xsl \
254-
--with-tidy=$(brew --prefix tidy-html5) \
255-
--enable-sysvsem \
256-
--enable-sysvshm \
257-
--enable-shmop \
258-
--enable-pcntl \
259-
--with-readline \
260-
--enable-mbstring \
261-
--with-curl \
262-
--with-gettext \
263247
--enable-sockets \
264-
--with-bz2 \
248+
--enable-mbstring \
265249
--with-openssl=$(brew --prefix openssl@3) \
266-
--with-gmp \
267-
--enable-bcmath \
268-
--enable-calendar \
269-
--enable-ftp \
270-
--enable-sysvmsg \
271-
--with-ffi \
272-
--enable-zend-test \
273-
--enable-dl-test=shared \
274-
--with-password-argon2 \
275-
--with-mhash \
276-
--with-sodium \
277-
--enable-dba \
278-
--with-cdb \
279-
--enable-flatfile \
280-
--enable-inifile \
281-
--with-config-file-path=/usr/local/etc \
282-
--with-config-file-scan-dir=/usr/local/etc/php.d \
283-
--enable-address-sanitizer \
284250
--enable-async
285251
286252
- name: Build PHP (macOS)

0 commit comments

Comments
 (0)