Skip to content

Commit 6633967

Browse files
committed
Remove hardcoded brew path in configure-macos action
1 parent 3733ea0 commit 6633967

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

.github/actions/configure-macos/action.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,25 @@ runs:
99
- shell: bash
1010
run: |
1111
set -x
12-
export PATH="/usr/local/opt/bison/bin:$PATH"
13-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig"
14-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
15-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
16-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
17-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
18-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
19-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
20-
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
12+
BREW_OPT="$(brew --prefix)"/opt
13+
export PATH="$BREW_OPT/bison/bin:$PATH"
14+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/[email protected]/lib/pkgconfig"
15+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
16+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/krb5/lib/pkgconfig"
17+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
18+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"
19+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
20+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
21+
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
2122
./buildconf --force
2223
./configure \
2324
--enable-option-checking=fatal \
2425
--prefix=/usr/local \
2526
--enable-fpm \
2627
--with-pdo-mysql=mysqlnd \
2728
--with-mysqli=mysqlnd \
28-
--with-pgsql=/usr/local/opt/libpq \
29-
--with-pdo-pgsql=/usr/local/opt/libpq \
29+
--with-pgsql="$BREW_OPT"/libpq \
30+
--with-pdo-pgsql="$BREW_OPT"/libpq \
3031
--with-pdo-sqlite \
3132
--without-pear \
3233
--enable-gd \
@@ -39,21 +40,21 @@ runs:
3940
--enable-soap \
4041
--enable-xmlreader \
4142
--with-xsl \
42-
--with-tidy=/usr/local/opt/tidy-html5 \
43+
--with-tidy="$BREW_OPT"/tidy-html5 \
4344
--with-libxml \
4445
--enable-sysvsem \
4546
--enable-sysvshm \
4647
--enable-shmop \
4748
--enable-pcntl \
48-
--with-readline=/usr/local/opt/readline \
49+
--with-readline="$BREW_OPT"/readline \
4950
--enable-mbstring \
5051
--with-curl \
51-
--with-gettext=/usr/local/opt/gettext \
52+
--with-gettext="$BREW_OPT"/gettext \
5253
--enable-sockets \
53-
--with-bz2=/usr/local/opt/bzip2 \
54+
--with-bz2="$BREW_OPT"/bzip2 \
5455
--with-openssl \
55-
--with-gmp=/usr/local/opt/gmp \
56-
--with-iconv=/usr/local/opt/libiconv \
56+
--with-gmp="$BREW_OPT"/gmp \
57+
--with-iconv="$BREW_OPT"/libiconv \
5758
--enable-bcmath \
5859
--enable-calendar \
5960
--enable-ftp \

0 commit comments

Comments
 (0)