Repository: trafficserver Updated Branches: refs/heads/master a0a74505e -> b4dea28aa
TS-3823 Fix tests for -lpthread, and undo some of TS-3308. This retains the support for ASAN in a cleaner way Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b4dea28a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b4dea28a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b4dea28a Branch: refs/heads/master Commit: b4dea28aaed390f1def4248a79361099cbb0b717 Parents: a0a7450 Author: Leif Hedstrom <[email protected]> Authored: Wed Aug 5 14:33:40 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed Aug 5 14:33:40 2015 -0600 ---------------------------------------------------------------------- cmd/traffic_crashlog/Makefile.am | 2 +- cmd/traffic_layout/Makefile.am | 2 +- cmd/traffic_manager/Makefile.am | 2 +- configure.ac | 11 +++++++---- proxy/Makefile.am | 6 ++---- 5 files changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4dea28a/cmd/traffic_crashlog/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am index e127b65..b977f51 100644 --- a/cmd/traffic_crashlog/Makefile.am +++ b/cmd/traffic_crashlog/Makefile.am @@ -42,4 +42,4 @@ traffic_crashlog_LDADD = \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ $(top_builddir)/mgmt/api/libtsmgmt.la \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBTCL@ @HWLOC_LIBS@ @LIBPTHREAD@ + @LIBTCL@ @HWLOC_LIBS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4dea28a/cmd/traffic_layout/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am index f0da43a..a9f714e 100644 --- a/cmd/traffic_layout/Makefile.am +++ b/cmd/traffic_layout/Makefile.am @@ -38,4 +38,4 @@ traffic_layout_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBTCL@ @HWLOC_LIBS@ @LIBPTHREAD@ + @LIBTCL@ @HWLOC_LIBS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4dea28a/cmd/traffic_manager/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am index 6c3b448..fecdd49 100644 --- a/cmd/traffic_manager/Makefile.am +++ b/cmd/traffic_manager/Makefile.am @@ -60,7 +60,7 @@ traffic_manager_LDADD = \ $(top_builddir)/proxy/shared/liberror.a \ $(top_builddir)/proxy/shared/libdiagsconfig.a \ $(LIBUNWIND_LIBS) \ - @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ @LIBPTHREAD@ \ + @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \ -lm # Must do it this way or the dependencies aren't detected. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4dea28a/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 0205ca5..22d6464 100644 --- a/configure.ac +++ b/configure.ac @@ -1052,15 +1052,18 @@ fi AC_SEARCH_LIBS([exc_capture_context], [exc], [], []) AC_SEARCH_LIBS([MLD_demangle_string], [mld], [], []) -AC_SEARCH_LIBS([dlsym], [dl], [], []) AC_SEARCH_LIBS([socket], [socket], [], []) AC_SEARCH_LIBS([gethostbyname], [nsl], [], []) AC_SEARCH_LIBS([clock_gettime], [rt], [], []) AC_SEARCH_LIBS([clock_gettime], [posix4], [], []) -dnl Linux has pthread symbol stubss in both libc ad libpthread, so it's important to test -dnl specifically for pthread_create() here. -AC_SEARCH_LIBS([pthread_create], [pthread],[AC_SUBST([LIBPTHREAD],["-lpthread"])], []) +dnl We check for dlsym here instead of e.g. dlopen() because ASAN hijacks the latter. +AC_SEARCH_LIBS([dlsym], [dl], [], []) + +dnl Linux has pthread symbol stubss in both libc and libpthread, so it's important to test +dnl specifically for pthread_kill() here. In addition, ASAN hijacks pthread_create() so +dnl we can't use that anymore. +AC_SEARCH_LIBS([pthread_kill], [pthread], [], []) dnl XXX The following check incorrectly causes the build to succeed dnl on Darwin. We should be using AC_SEARCH_LIBS, but rest_init is http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b4dea28a/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 6dc0f6f..0160294 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -233,7 +233,6 @@ traffic_server_LDADD = \ @LIBPROFILER@ \ @SPDYLAY_LIBS@ \ @OPENSSL_LIBS@ \ - @LIBPTHREAD@ \ -lm if BUILD_LUAJIT @@ -255,7 +254,7 @@ traffic_logcat_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\ - @LIBEXPAT@ @LIBPROFILER@ @LIBPTHREAD@ -lm + @LIBEXPAT@ @LIBPROFILER@ -lm traffic_logstats_SOURCES = logstats.cc traffic_logstats_LDADD = \ @@ -268,7 +267,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \ - @LIBEXPAT@ @LIBPROFILER@ @LIBPTHREAD@ -lm + @LIBEXPAT@ @LIBPROFILER@ -lm traffic_sac_SOURCES = \ sac.cc \ @@ -331,7 +330,6 @@ traffic_sac_LDADD = \ @LIBPROFILER@ \ @SPDYLAY_LIBS@ \ @OPENSSL_LIBS@ \ - @LIBPTHREAD@ \ -lm if BUILD_TESTS
