Skip to content

Commit 3d67dfb

Browse files
committed
.
1 parent 61fcaae commit 3d67dfb

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

.github/workflows/Dockerfile.centos-php-test-zts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,7 @@ COPY --from=base /usr/local/lib /usr/local/lib
7878
COPY --from=base /usr/local/lib64 /usr/local/lib64
7979

8080
# Build PHP with ZTS enabled and conditionally link lexbor for PHP 8.4+
81-
RUN if [ -f /usr/local/lib64/liblexbor_static.a ]; then \
82-
echo "Building PHP ${PHP_VERSION} with static lexbor (8.4+)"; \
83-
export CFLAGS="-I/usr/local/include"; \
84-
export LDFLAGS="-L/usr/local/lib -L/usr/local/lib64"; \
85-
export LIBS="/usr/local/lib64/liblexbor_static.a"; \
86-
ls -lh /usr/local/lib*/liblexbor* || true; \
87-
else \
88-
echo "Building PHP ${PHP_VERSION} without lexbor (< 8.4)"; \
89-
fi && \
90-
./configure \
81+
RUN ./configure \
9182
--prefix=/usr/local \
9283
--with-config-file-path=/usr/local/lib \
9384
--with-config-file-scan-dir=/usr/local/etc/php/conf.d \

.github/workflows/Dockerfile.ubuntu-php-test-zts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,7 @@ ARG PHP_VERSION
7070
COPY --from=base /usr/local/include /usr/local/include
7171
COPY --from=base /usr/local/lib /usr/local/lib
7272

73-
# Build PHP with ZTS enabled and conditionally link lexbor for PHP 8.4+
74-
RUN if [ -f /usr/local/lib/liblexbor_static.a ]; then \
75-
echo "Building PHP ${PHP_VERSION} with static lexbor (8.4+)"; \
76-
export CFLAGS="-I/usr/local/include"; \
77-
export LDFLAGS="-L/usr/local/lib"; \
78-
export LIBS="/usr/local/lib/liblexbor_static.a"; \
79-
ls -lh /usr/local/lib/liblexbor* || true; \
80-
else \
81-
echo "Building PHP ${PHP_VERSION} without lexbor (< 8.4)"; \
82-
fi && \
83-
./configure \
73+
RUN ./configure \
8474
--prefix=/usr/local \
8575
--with-config-file-path=/usr/local/lib \
8676
--with-config-file-scan-dir=/usr/local/etc/php/conf.d \

0 commit comments

Comments
 (0)