File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -84,7 +84,8 @@ RUN apk update; \
84
84
wget \
85
85
xz \
86
86
gettext-dev \
87
- binutils-gold
87
+ binutils-gold \
88
+ patchelf
88
89
89
90
RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$ (uname -m).tar.gz | tar -xz -C /usr/local/bin && \
90
91
chmod +x /usr/local/bin/php
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' > /tmp/spc-gnu-docker.env
141
141
echo ' CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
142
142
echo ' AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
143
143
echo ' LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
144
- echo ' SPC_DEFAULT_C_FLAGS=-fPIE - fPIC' >> /tmp/spc-gnu-docker.env
144
+ echo ' SPC_DEFAULT_C_FLAGS=-fPIC' >> /tmp/spc-gnu-docker.env
145
145
echo ' SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
146
146
echo ' SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
147
147
echo ' SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
Original file line number Diff line number Diff line change @@ -503,7 +503,7 @@ protected function getStaticAndSharedLibs(): array
503
503
continue ;
504
504
}
505
505
$ static_lib = 'lib ' . $ lib . '.a ' ;
506
- if (file_exists (BUILD_LIB_PATH . '/ ' . $ static_lib )) {
506
+ if (file_exists (BUILD_LIB_PATH . '/ ' . $ static_lib ) && ! str_contains ( $ static_lib , ' libphp ' ) ) {
507
507
if (!str_contains ($ staticLibString , '-l ' . $ lib . ' ' )) {
508
508
$ staticLibString .= '-l ' . $ lib . ' ' ;
509
509
}
You can’t perform that action at this time.
0 commit comments