Repository: trafficserver Updated Branches: refs/heads/master 996237393 -> d8798d915
Remove unused check for libdemangle on Solaris Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d8798d91 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d8798d91 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d8798d91 Branch: refs/heads/master Commit: d8798d915630f2ed617df7d5e7dd5d02a00f29af Parents: 9962373 Author: James Peach <[email protected]> Authored: Fri Sep 19 12:44:22 2014 -0700 Committer: James Peach <[email protected]> Committed: Fri Sep 19 12:59:15 2014 -0700 ---------------------------------------------------------------------- configure.ac | 13 ------------- proxy/Makefile.am | 7 +++---- 2 files changed, 3 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d8798d91/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index a90ff40..0785790 100644 --- a/configure.ac +++ b/configure.ac @@ -1244,19 +1244,6 @@ if test "x${with_profiler}" = "xyes"; then fi AC_SUBST(has_profiler) -# For SunPro 5.2 - we need the demangle symbol for -# ink_stack_trace.cc in lib/ts. Because this -# library is part of the SunPro distribution, we need -# check with the C++ compiler since we might be using -# SunPro CC for the C++ compiler and gcc for the C compiler -AC_LANG_PUSH([C++]) -AC_SEARCH_LIBS([cplus_demangle],[demangle], - [LIBDEMANGLE="-ldemangle" - ] -) -AC_SUBST([LIBDEMANGLE]) -AC_LANG_POP - AC_MSG_CHECKING(for 128bit CAS support) AC_LANG_PUSH([C++]) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d8798d91/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 530f0c9..dc5c2a3 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -223,7 +223,6 @@ traffic_server_LDADD = \ @OPENSSL_LIBS@ \ @LIBTCL@ \ @LIBEXPAT@ \ - @LIBDEMANGLE@ \ @LIBCAP@ \ @LIBRESOLV@ \ @LIBZ@ \ @@ -253,7 +252,7 @@ traffic_logcat_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm + @LIBEXPAT@ @LIBPROFILER@ -lm traffic_logstats_SOURCES = logstats.cc traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ @@ -268,7 +267,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm + @LIBEXPAT@ @LIBPROFILER@ -lm traffic_sac_SOURCES = \ sac.cc \ @@ -326,7 +325,7 @@ traffic_sac_LDADD = \ $(top_builddir)/lib/records/librecords_p.a \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm + @LIBEXPAT@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm if BUILD_TESTS traffic_sac_SOURCES += RegressionSM.cc
