php56: Convert libgcc fix to a patch to mirror php7*.

3 files changed, 24 insertions, 18 deletions

diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index 1cd98e418d9..45a55e99ae0 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/10/27 08:45:06 taca Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/16 11:28:09 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -47,12 +47,6 @@ INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 CFLAGS+=	-DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "clang"
-CONFIGURE_ARGS+=	--disable-libgcc
-.endif
-
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
 	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
diff --git a/lang/php56/distinfo b/lang/php56/distinfo
index f06866f7c6f..1b02211a4be 100644
--- a/lang/php56/distinfo
+++ b/lang/php56/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2018/01/05 03:08:36 taca Exp $
+$NetBSD: distinfo,v 1.45 2018/01/16 11:28:09 jperkin Exp $
 
 SHA1 (php-5.6.33.tar.bz2) = c101b6af3486bb907e1c7a54dc41a3bbd9c33eaa
 RMD160 (php-5.6.33.tar.bz2) = 30332f36e233db5784b35c50cb87f1da6d10a1b4
 SHA512 (php-5.6.33.tar.bz2) = d57d87bf5ceb4b8b72908dc9d4236533697ba7055c25bdd299b35ff42b9d0258020241953a6f2c448929742c73fb2e3c67aa630c556af8fccbbe312ec51f1576
 Size (php-5.6.33.tar.bz2) = 15057552 bytes
 SHA1 (patch-acinclude.m4) = 34d38d2538cc00932cdfcc80d1d4a91632cd15d0
-SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
+SHA1 (patch-configure) = a5623b0cbb3331fd0a537b26c0ae48315d52dbe2
 SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
 SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
diff --git a/lang/php56/patches/patch-configure b/lang/php56/patches/patch-configure
index e3758533f89..03e56d6d923 100644
--- a/lang/php56/patches/patch-configure
+++ b/lang/php56/patches/patch-configure
@@ -1,8 +1,20 @@
-$NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
+$NetBSD: patch-configure,v 1.4 2018/01/16 11:28:09 jperkin Exp $
 
---- configure.orig	2016-04-28 00:53:20.000000000 +0000
+Don't automatically add libgcc on SunOS.
+
+--- configure.orig	2018-01-03 00:28:11.000000000 +0000
 +++ configure
-@@ -8315,27 +8315,6 @@ EOF
+@@ -5459,9 +5459,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"
+@@ -8315,27 +8312,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +42,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -9139,27 +9118,6 @@ EOF
+@@ -9139,27 +9115,6 @@ EOF
      ;;
    esac
  
@@ -58,7 +70,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -24712,7 +24670,7 @@ fi
+@@ -24712,7 +24667,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -67,7 +79,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -26868,7 +26826,7 @@ $as_echo "yes" >&6; }
+@@ -26868,7 +26823,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -76,7 +88,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -37985,7 +37943,7 @@ fi
+@@ -37985,7 +37940,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -85,7 +97,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -49597,7 +49555,7 @@ fi
+@@ -49597,7 +49552,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -94,7 +106,7 @@ $NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -107117,12 +107075,7 @@ old_CC=$CC
+@@ -107120,12 +107075,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"