6b44c68f69
This resulted in a mod_php that cannot be loaded, as reported in joyent/pkgsrc#152. Patch copied from php71. Bump PKGREVISION.
60 lines
1.9 KiB
Text
60 lines
1.9 KiB
Text
$NetBSD: patch-configure,v 1.11 2019/03/11 13:43:22 jperkin Exp $
|
|
|
|
Don't automatically add libgcc on SunOS. Reported upstream as #75941.
|
|
Don't autodetect maintainer-zts.
|
|
The meta_ccld removal reported upstream as #75940.
|
|
|
|
--- configure.orig 2019-02-05 15:43:47.000000000 +0000
|
|
+++ configure
|
|
@@ -5463,9 +5463,6 @@ fi
|
|
case $host_alias in
|
|
*solaris*)
|
|
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
|
|
- if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
|
|
- enable_libgcc=yes
|
|
- fi
|
|
;;
|
|
*dgux*)
|
|
CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
|
|
@@ -7008,27 +7005,6 @@ EOF
|
|
;;
|
|
esac
|
|
|
|
- if test "$APACHE_VERSION" -lt 2004001; then
|
|
- APXS_MPM=`$APXS -q MPM_NAME`
|
|
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- else
|
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
|
|
- if test -n "$APACHE_THREADED_MPM"; then
|
|
-
|
|
- enable_maintainer_zts=yes
|
|
- if test "$pthreads_working" != "yes"; then
|
|
- as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
|
|
- fi
|
|
-
|
|
- fi
|
|
- fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
$as_echo "yes" >&6; }
|
|
|
|
@@ -97130,12 +97106,7 @@ old_CC=$CC
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
|
|
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
|
|
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
|
|
- cat >meta_ccld<<EOF
|
|
-#! /bin/sh
|
|
-exec $CC $ac_cv_pthreads_cflags \$@
|
|
-EOF
|
|
- CC="$abs_builddir/meta_ccld"
|
|
- chmod +x meta_ccld
|
|
+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
|
|
fi
|
|
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
|