46 lines
1.3 KiB
Text
46 lines
1.3 KiB
Text
|
Index: configure.ac
|
||
|
|
--- configure.ac.orig
|
||
|
|
+++ configure.ac
|
||
|
|
@@ -373,11 +373,7 @@ 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.])
|
||
|
|
- ])
|
||
|
|
+ PHP_CHECK_FUNC(__atomic_exchange_1, atomic)
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
@@ -1159,16 +1155,16 @@ case $php_sapi_module in
|
||
|
|
fi
|
||
|
|
case $with_pic in
|
||
|
|
yes)
|
||
|
|
- standard_libtool_flag='-prefer-pic'
|
||
|
|
+ standard_libtool_flag=''
|
||
|
|
;;
|
||
|
|
no)
|
||
|
|
- standard_libtool_flag='-prefer-non-pic'
|
||
|
|
+ standard_libtool_flag=''
|
||
|
|
;;
|
||
|
|
esac
|
||
|
|
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
|
||
|
|
;;
|
||
|
|
*[)]
|
||
|
|
- standard_libtool_flag='-prefer-non-pic -static'
|
||
|
|
+ standard_libtool_flag=''
|
||
|
|
if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
|
||
|
|
enable_shared=no
|
||
|
|
fi
|
||
|
|
@@ -1424,7 +1420,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
|
||
|
|
EXPANDED_DATADIR=$datadir
|
||
|
|
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
|
||
|
|
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
|
||
|
|
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
|
||
|
|
+INCLUDE_PATH=.:$libdir
|
||
|
|
|
||
|
|
exec_prefix=$old_exec_prefix
|
||
|
|
libdir=$old_libdir
|