summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-01-15 23:07:37 +0000
committerKarl Berry <karl@freefriends.org>2018-01-15 23:07:37 +0000
commit9c2e4bc21eb830f221e6112566776cb04ded1d5b (patch)
tree5630095a2bdb75822ebc0c557fc7a5fef1604ec1 /Build
parent7001aee81ff8c5ab14d5a8acf8f0eca02de01a5a (diff)
do not disable C++11 on Solaris
git-svn-id: svn://tug.org/texlive/trunk@46325 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/icu/TLpatches/ChangeLog4
-rw-r--r--Build/source/libs/icu/TLpatches/patch-02-configure-solaris22
-rwxr-xr-xBuild/source/libs/icu/icu-src/source/configure11
3 files changed, 32 insertions, 5 deletions
diff --git a/Build/source/libs/icu/TLpatches/ChangeLog b/Build/source/libs/icu/TLpatches/ChangeLog
index 38ffaf22527..715ba31581d 100644
--- a/Build/source/libs/icu/TLpatches/ChangeLog
+++ b/Build/source/libs/icu/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-16 Karl Berry <karl@tug.org>
+
+ * patch-02-configure-solaris: add.
+
2018-01-12 Karl Berry <karl@freefriends.org>
* patch-16-putil,
diff --git a/Build/source/libs/icu/TLpatches/patch-02-configure-solaris b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
new file mode 100644
index 00000000000..c7b16e37aa1
--- /dev/null
+++ b/Build/source/libs/icu/TLpatches/patch-02-configure-solaris
@@ -0,0 +1,22 @@
+ Do not disable C++11 on Solaris.
+
+--- configure (revision 46316)
++++ configure (working copy)
+@@ -6033,11 +6033,12 @@
+ else
+ CXXFLAGS="$OLD_CXXFLAGS"
+ fi
+- case "${host}" in
+- *-*-solaris*)
+- CXXFLAGS="$OLD_CXXFLAGS"
+- ;;
+- esac
++# TL: why? http://bugs.icu-project.org/trac/ticket/13543
++# case "${host}" in
++# *-*-solaris*)
++# CXXFLAGS="$OLD_CXXFLAGS"
++# ;;
++# esac
+ fi
+ fi
+
diff --git a/Build/source/libs/icu/icu-src/source/configure b/Build/source/libs/icu/icu-src/source/configure
index 4ba9f5d982d..c3e472249ec 100755
--- a/Build/source/libs/icu/icu-src/source/configure
+++ b/Build/source/libs/icu/icu-src/source/configure
@@ -6033,11 +6033,12 @@ $as_echo "$as_me: Adding CXXFLAGS option -std=c++11" >&6;}
else
CXXFLAGS="$OLD_CXXFLAGS"
fi
- case "${host}" in
- *-*-solaris*)
- CXXFLAGS="$OLD_CXXFLAGS"
- ;;
- esac
+# TL: why? http://bugs.icu-project.org/trac/ticket/13543
+# case "${host}" in
+# *-*-solaris*)
+# CXXFLAGS="$OLD_CXXFLAGS"
+# ;;
+# esac
fi
fi