mirror of
https://github.com/danog/php.git
synced 2024-11-26 20:04:58 +01:00
try fixing patch
This commit is contained in:
parent
3b08ef5938
commit
bbd55fce38
3
8.2/sid/cli/Dockerfile
generated
3
8.2/sid/cli/Dockerfile
generated
@ -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
21
latomic.patch
Normal 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)
|
||||
|
Loading…
Reference in New Issue
Block a user