diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2018-02-08 21:23:04 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2018-02-08 21:23:04 +0000 |
| commit | e4c1d9864013a33e317c6107ac472f31c583f949 (patch) | |
| tree | 6f922df6d374785a471e5aeff3c74f95a2c82656 /lang/php72 | |
| parent | 656ccc7475e312a8e5cec8fd604a36d2f6ee2ebf (diff) | |
| download | pkgsrc-e4c1d9864013a33e317c6107ac472f31c583f949.tar.gz | |
drop patch removing pthread checks for apache <2.4.1 module build
the patch predates php56, doesn't seem to be necessary when building
with apache22, and we want to reduce diffs against upstream; maybe
that part was needed with distant past with apache 1.3 or whatnot,
but that is not in pkgsrc any more
Diffstat (limited to 'lang/php72')
| -rw-r--r-- | lang/php72/distinfo | 4 | ||||
| -rw-r--r-- | lang/php72/patches/patch-configure | 32 |
2 files changed, 4 insertions, 32 deletions
diff --git a/lang/php72/distinfo b/lang/php72/distinfo index ba84966bab4..f2cd53c10f6 100644 --- a/lang/php72/distinfo +++ b/lang/php72/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.17 2018/02/08 20:55:42 jdolecek Exp $ +$NetBSD: distinfo,v 1.18 2018/02/08 21:23:04 jdolecek Exp $ SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066 RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca SHA512 (php-7.2.2.tar.bz2) = d2bc3725b51c61ded552cfde276bbe0f9e4cce3401303219d3784497d7f989e4a23c673fd2d2a827b7823664f922eededed0d242dc70a6f4863ce4f89573d211 Size (php-7.2.2.tar.bz2) = 14618006 bytes -SHA1 (patch-configure) = bcfe41b9101b1af766af725d5b1888fbc746173c +SHA1 (patch-configure) = 32210b716e8e6d08d3006b94db3f7ecb0ac2a458 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489 SHA1 (patch-ext_imap_config.m4) = 6a667b2580901dccfd0174aec56dad629689d7bd SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 diff --git a/lang/php72/patches/patch-configure b/lang/php72/patches/patch-configure index cdb7eb2316a..8e2e8300834 100644 --- a/lang/php72/patches/patch-configure +++ b/lang/php72/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.7 2018/02/08 20:55:42 jdolecek Exp $ +$NetBSD: patch-configure,v 1.8 2018/02/08 21:23:04 jdolecek Exp $ Don't automatically add libgcc on SunOS. @@ -14,35 +14,7 @@ Don't automatically add libgcc on SunOS. ;; *dgux*) CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR" -@@ -7007,27 +7004,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; } - -@@ -96116,12 +96092,7 @@ old_CC=$CC +@@ -96116,12 +96113,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" |