Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1493110724185290"
MIME-Version: 1.0
Date: Tue, 25 Apr 2017 08:58:44 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/icu
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20170425085844.F2325FBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1493110724185290
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Tue Apr 25 08:58:44 UTC 2017

Modified Files:
	pkgsrc/textproc/icu: distinfo
	pkgsrc/textproc/icu/patches: patch-configure

Log Message:
icu: remove part of configure script stripping -std=c++11 on Solaris
Blind build fix attempt for SmartOS.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/icu/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1493110724185290
Content-Disposition: inline
Content-Length: 3753
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.64 pkgsrc/textproc/icu/distinfo:1.65
--- pkgsrc/textproc/icu/distinfo:1.64	Sat Apr 22 20:11:45 2017
+++ pkgsrc/textproc/icu/distinfo	Tue Apr 25 08:58:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2017/04/22 20:11:45 adam Exp $
+$NetBSD: distinfo,v 1.65 2017/04/25 08:58:44 maya Exp $
 
 SHA1 (icu4c-59_1-src.tgz) = e86189f53c0a01cecf093a555e1ebbd14abf5b82
 RMD160 (icu4c-59_1-src.tgz) = fe4bad598bbe0833b05e4626a1c941ad5e58a809
@@ -16,7 +16,7 @@ SHA1 (patch-config_icu-config-bottom) = 
 SHA1 (patch-config_mh-darwin) = 32f0e4c241535e37e4cad9b871ed3d36b4184199
 SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-config_mh-solaris-gcc) = 19f76c27bef22cc3b572e4b67a526d5f1aa077bc
-SHA1 (patch-configure) = 429c0b3eb3f7d0a8cf3d01a9bc359132eebe8cf4
+SHA1 (patch-configure) = fdeae51f4390779dfd8df8471196e322cbb9ea3d
 SHA1 (patch-configure.ac) = b0291cf02351cbad9b0c7340baea9eb81cabb158
 SHA1 (patch-i18n_digitlst.cpp) = 2db1a8e28e353ecf201f965d9719d451534865ad
 SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663

Index: pkgsrc/textproc/icu/patches/patch-configure
diff -u pkgsrc/textproc/icu/patches/patch-configure:1.8 pkgsrc/textproc/icu/patches/patch-configure:1.9
--- pkgsrc/textproc/icu/patches/patch-configure:1.8	Fri Oct  9 23:15:34 2015
+++ pkgsrc/textproc/icu/patches/patch-configure	Tue Apr 25 08:58:44 2017
@@ -1,12 +1,14 @@
-$NetBSD: patch-configure,v 1.8 2015/10/09 23:15:34 ryoon Exp $
+$NetBSD: patch-configure,v 1.9 2017/04/25 08:58:44 maya Exp $
 
 Portability fix.
 Solaris seems to need -std=c99 with recent pkgsrc so keep it.
+don't throw away -std=c++11 on solaris unconditionally, it's
+required.
 Add support for Bitrig.
 
---- configure.orig	2015-10-08 04:00:24.000000000 +0000
+--- configure.orig	2017-04-07 07:40:30.000000000 +0000
 +++ configure
-@@ -5174,7 +5174,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5175,7 +5175,7 @@ rm -f core conftest.err conftest.$ac_obj
  		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
  		esac
  	fi ;;
@@ -15,7 +17,7 @@ Add support for Bitrig.
  *-*-aix*)
  	if test "$GCC" = yes; then
  		icu_cv_host_frag=mh-aix-gcc
-@@ -5199,6 +5199,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -5200,6 +5200,7 @@ rm -f core conftest.err conftest.$ac_obj
  *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
  *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
  *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
@@ -23,7 +25,7 @@ Add support for Bitrig.
  *) 		icu_cv_host_frag=mh-unknown ;;
  esac
  
-@@ -5736,6 +5737,29 @@ if test "x$plugins" = "xtrue"; then
+@@ -5808,6 +5809,29 @@ if test "x$plugins" = "xtrue"; then
  fi
  
  
@@ -53,7 +55,19 @@ Add support for Bitrig.
  U_ENABLE_DYLOAD=1
  enable=yes
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5
-@@ -7729,7 +7753,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
+@@ -6021,11 +6045,6 @@ $as_echo "$as_me: Adding CXXFLAGS option
+         else
+             CXXFLAGS="$OLD_CXXFLAGS"
+         fi
+-        case "${host}" in
+-        *-*-solaris*)
+-            CXXFLAGS="$OLD_CXXFLAGS"
+-            ;;
+-        esac
+     fi
+ fi
+ 
+@@ -7776,7 +7795,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
  case "${host}" in
  	*-*-solaris*) 	platform=U_SOLARIS ;;
  	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
@@ -62,7 +76,7 @@ Add support for Bitrig.
  	*-*-aix*) 	platform=U_AIX ;;
  	*-*-hpux*) 	platform=U_HPUX ;;
  	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
-@@ -7765,13 +7789,13 @@ fi
+@@ -7812,13 +7831,13 @@ fi
  # Now that we're done using CPPFLAGS etc. for tests, we can change it
  # for build.
  

--_----------=_1493110724185290--