[pkgsrc/trunk]: pkgsrc/lang/php70 php70: Don't automatically add libgcc on Su...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/95008bbe7636
branches:  trunk
changeset: 374104:95008bbe7636
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jan 16 11:26:18 2018 +0000

description:
php70: Don't automatically add libgcc on SunOS.

diffstat:

 lang/php70/distinfo                |   4 ++--
 lang/php70/patches/patch-configure |  30 +++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diffs (98 lines):

diff -r da3eb8344ce0 -r 95008bbe7636 lang/php70/distinfo
--- a/lang/php70/distinfo       Tue Jan 16 11:04:54 2018 +0000
+++ b/lang/php70/distinfo       Tue Jan 16 11:26:18 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.41 2018/01/05 03:09:59 taca Exp $
+$NetBSD: distinfo,v 1.42 2018/01/16 11:26:18 jperkin Exp $
 
 SHA1 (php-7.0.27.tar.bz2) = 2fb93fca0e3a514286e90b91e165d3f3242bcd4c
 RMD160 (php-7.0.27.tar.bz2) = 48ea0689cdd8a9ec4f2f2d04ab8832d83fd6f07f
 SHA512 (php-7.0.27.tar.bz2) = 652dbeb06e6b9e90f2fd48a2a6bba1d3de05d6ebac2774bdfffe403ec6197f532708d854452d84a14414918983fe813c4b4a3d438a807112923554d34e6eb6cc
 Size (php-7.0.27.tar.bz2) = 14154690 bytes
 SHA1 (patch-acinclude.m4) = 81a8f33a536500978ea5a9aa2d2875c61c843e56
-SHA1 (patch-configure) = a129e19ef87338f6e53ccc967c40ddcde7c7357c
+SHA1 (patch-configure) = 68ca63d7623feee2f12c9e1abacf4a5d7827d96c
 SHA1 (patch-ext_gd_config.m4) = bde93678626592cdcee619189bfc6532d0913a76
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 222e35fc2c3e9e559696293fdf66171f8abfca7f
diff -r da3eb8344ce0 -r 95008bbe7636 lang/php70/patches/patch-configure
--- a/lang/php70/patches/patch-configure        Tue Jan 16 11:04:54 2018 +0000
+++ b/lang/php70/patches/patch-configure        Tue Jan 16 11:26:18 2018 +0000
@@ -1,8 +1,20 @@
-$NetBSD: patch-configure,v 1.3 2016/05/02 13:09:49 taca Exp $
+$NetBSD: patch-configure,v 1.4 2018/01/16 11:26:18 jperkin Exp $
+
+Don't automatically add libgcc on SunOS.
 
---- configure.orig     2016-04-28 18:12:26.000000000 +0000
+--- configure.orig     2018-01-02 08:51:27.000000000 +0000
 +++ configure
-@@ -6930,27 +6930,6 @@ EOF
+@@ -5435,9 +5435,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"
+@@ -6908,27 +6905,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +42,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18408,7 +18387,7 @@ fi
+@@ -18390,7 +18366,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -39,7 +51,7 @@
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -20572,7 +20551,7 @@ $as_echo "yes" >&6; }
+@@ -20744,7 +20720,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -48,7 +60,7 @@
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -31742,7 +31721,7 @@ fi
+@@ -31965,7 +31941,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -57,7 +69,7 @@
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -42631,7 +42610,7 @@ fi
+@@ -42857,7 +42833,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -66,7 +78,7 @@
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -92806,7 +92785,7 @@ fi
+@@ -93495,7 +93471,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -75,7 +87,7 @@
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -96439,12 +96418,7 @@ old_CC=$CC
+@@ -97121,12 +97097,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"