From 7143b825c92e724274548bd361e116b5c293ab47 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Tue, 16 Jan 2018 10:49:56 +0000
Subject: [PATCH] php72: Don't automatically add libgcc on SunOS.

---
 lang/php72/distinfo                |  4 ++--
 lang/php72/patches/patch-configure | 24 ++++++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lang/php72/distinfo b/lang/php72/distinfo
index 6f1b99caa41f..9495358c2109 100644
--- a/lang/php72/distinfo
+++ b/lang/php72/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2018/01/05 03:12:12 taca Exp $
+$NetBSD: distinfo,v 1.12 2018/01/16 10:49:56 jperkin Exp $
 
 SHA1 (php-7.2.1.tar.bz2) = 3e5ad89b44fb83b9c356ba11c1c62b9ff3fad633
 RMD160 (php-7.2.1.tar.bz2) = 1959cd1fff0b222d20afd0aaf57f4c557ce72b51
 SHA512 (php-7.2.1.tar.bz2) = e9b6c013a06a771c2fa7581e49e6d6e019fe8fc6f8881a43905f7e87df5fc05420559fe40fb663d272ffc5cc188c4ef7c3ca835f5c542a28ca8de1cd42782865
 Size (php-7.2.1.tar.bz2) = 14980278 bytes
-SHA1 (patch-configure) = 71d2e8334bea48db1e65c82219f2a93cf8d46159
+SHA1 (patch-configure) = 277e60446932fabb5ad1c696052de1c0a6248dc8
 SHA1 (patch-ext_curl_config.m4) = 86a293d57aafcd42d1feab4a6d0d4f88dbcfb5c8
 SHA1 (patch-ext_gd_config.m4) = 67730ccc13410adaf8829f77a6b044f16e412489
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
diff --git a/lang/php72/patches/patch-configure b/lang/php72/patches/patch-configure
index 85440c60599c..d61a09452104 100644
--- a/lang/php72/patches/patch-configure
+++ b/lang/php72/patches/patch-configure
@@ -1,8 +1,20 @@
-$NetBSD: patch-configure,v 1.4 2017/12/03 12:54:34 jdolecek Exp $
+$NetBSD: patch-configure,v 1.5 2018/01/16 10:49:57 jperkin Exp $
 
---- configure.orig	2017-11-07 11:57:02.000000000 +0000
+Don't automatically add libgcc on SunOS.
+
+--- configure.orig	2018-01-02 22:35:52.000000000 +0000
 +++ configure
-@@ -7007,27 +7007,6 @@ EOF
+@@ -5461,9 +5461,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"
+@@ -7007,27 +7004,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +42,7 @@ $NetBSD: patch-configure,v 1.4 2017/12/03 12:54:34 jdolecek Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -21090,7 +21069,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
+@@ -21090,7 +21066,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -39,7 +51,7 @@ $NetBSD: patch-configure,v 1.4 2017/12/03 12:54:34 jdolecek Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -23626,7 +23605,7 @@ fi
+@@ -23626,7 +23602,7 @@ fi
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl.pc" >&5
  $as_echo_n "checking for libcurl.pc... " >&6; }
@@ -48,7 +60,7 @@ $NetBSD: patch-configure,v 1.4 2017/12/03 12:54:34 jdolecek Exp $
        PKNAME=libcurl
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default path" >&5
  $as_echo "using default path" >&6; }
-@@ -95975,12 +95954,7 @@ old_CC=$CC
+@@ -95975,12 +95951,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"