try fixing patch

This commit is contained in:
Daniil Gentili 2023-05-30 19:11:49 +02:00
parent 3b08ef5938
commit bbd55fce38
Signed by: danog
GPG Key ID: 8C1BE3B34B230CA7
2 changed files with 24 additions and 0 deletions

View File

@ -96,6 +96,7 @@ RUN set -eux; \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
COPY docker-php-source /usr/local/bin/
COPY latomic.patch /
RUN set -eux; \
\
@ -126,6 +127,8 @@ RUN set -eux; \
if [ ! -d /usr/include/curl ]; then \
ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
fi; \
patch -p1 < /latomic.patch; \
rm /latomic.patch; \
./configure \
--build="$gnuArch" \
--with-config-file-path="$PHP_INI_DIR" \

21
latomic.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/configure.ac b/configure.ac
index fcb6297238..0a475ed80f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,6 +373,16 @@ if test "$ac_cv_func_dlopen" = "yes"; then
fi
AC_CHECK_LIB(m, sin)
+case $host_alias in
+ riscv64*)
+ AC_CHECK_LIB(atomic, __atomic_exchange_1, [
+ PHP_ADD_LIBRARY(atomic)
+ ], [
+ AC_MSG_ERROR([Problem with enabling atomic. Please check config.log for details.])
+ ])
+ ;;
+esac
+
dnl Check for inet_aton in -lc, -lbind and -lresolv.
PHP_CHECK_FUNC(inet_aton, resolv, bind)