Repository: trafficserver
Updated Branches:
  refs/heads/master 5acff2c66 -> 06825735c


TS-1486 Drop support for Sun Studio compilers


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/06825735
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/06825735
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/06825735

Branch: refs/heads/master
Commit: 06825735ca85c3d910e9d6cceb6b8628ece757a4
Parents: 5acff2c
Author: Leif Hedstrom <[email protected]>
Authored: Wed May 21 18:00:42 2014 -0600
Committer: Leif Hedstrom <[email protected]>
Committed: Wed May 21 18:00:46 2014 -0600

----------------------------------------------------------------------
 CHANGES                     |  2 ++
 configure.ac                | 17 ++---------------
 contrib/manifests/omnios.sh |  1 -
 3 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06825735/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e35a18e..0ce0700 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.0.0
 
+  *) [TS-1486] Drop support for Sun Studio compilers.
+
   *) [TS-2765] Memory Leak in SSLConfig initialization
 
   *) [TS-1125] POST's with Expect: 100-continue are slowed by delayed 100

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06825735/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 612daf6..9c7ccdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -790,9 +790,9 @@ AX_PROG_PERL_MODULES([ExtUtils::MakeMaker], 
AM_CONDITIONAL([BUILD_PERL_LIB], [tr
                                             AM_CONDITIONAL([BUILD_PERL_LIB], 
[false])
 )
 
-# Check for GNU-style -On and for Solaris Studio style -xOn.
+# Check for GNU-style -On optimization flags
 AC_MSG_CHECKING([checking whether to auto-set compiler optimization flags])
-has_optimizer_flags=`echo "$CFLAGS $CXXFLAGS" | ${AWK} '$0 !~ /-x?O.?/{print 
"no"}'`
+has_optimizer_flags=`echo "$CFLAGS $CXXFLAGS" | ${AWK} '$0 !~ /-O.?/{print 
"no"}'`
 AS_IF([test "x${has_optimizer_flags}" = "xno"],
        [
                optimizing_flags='-O3'
@@ -898,19 +898,6 @@ case $host_os_def in
     ;; # freebsd|kfreebsd)
 
   solaris)
-    AS_IF([test "x$ax_cv_c_compiler_vendor" = "xsun"], [
-      # XXX: Solaris Studio support is going away: 
https://issues.apache.org/jira/browse/TS-1486
-      common_opt="-mt -D__WORDSIZE=64" # FIXME: arch should be detected
-      debug_opt="-g $common_opt"
-      release_opt="-g $common_opt $optimizing_flags"
-      cxx_opt="-library=stlport4"
-      cxx_dbg="+w2"
-      cxx_rel="-erroff"
-
-      AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [posix thread semantics])
-      AS_IF([test "x$solaris_use_stlport4" != "xyes"], 
[postdeps_CXX="-library=Crun"])
-    ])
-
     AS_IF([test "x$ax_cv_c_compiler_vendor" = "xgnu"], [
       common_opt="-pipe -Wall"
       debug_opt="-ggdb3 $common_opt"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/06825735/contrib/manifests/omnios.sh
----------------------------------------------------------------------
diff --git a/contrib/manifests/omnios.sh b/contrib/manifests/omnios.sh
index e1872a2..75b5a4f 100644
--- a/contrib/manifests/omnios.sh
+++ b/contrib/manifests/omnios.sh
@@ -20,7 +20,6 @@ pkg refresh
 
 # Base ATS build dependencies.
 pkg install \
-  developer/sunstudio12.1 \
   developer/gcc46 \
   developer/object-file \
   developer/linker \

Reply via email to