TS-2875 Change hwloc library env variables from hwloc_ to HWLOC_
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/54db32b2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/54db32b2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/54db32b2 Branch: refs/heads/5.0.x Commit: 54db32b2daa110403cade8c526606b9b90a62cff Parents: 0e3035e Author: Leif Hedstrom <[email protected]> Authored: Wed Jun 4 10:07:40 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed Jun 4 10:30:26 2014 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ configure.ac | 14 +++++++------- iocore/aio/Makefile.am | 2 +- iocore/eventsystem/Makefile.am | 2 +- lib/ts/Makefile.am | 2 +- mgmt/Makefile.am | 2 +- proxy/Makefile.am | 8 ++++---- 7 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 1addfe4..98805b3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2875] Change hwloc library env variables from hwloc_ to HWLOC_. + *) [TS-2874] Make some of the SPDY metrics persistent, and also fix how we measure transaction time / total streams. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 29520c1..8bf3d85 100644 --- a/configure.ac +++ b/configure.ac @@ -1337,7 +1337,7 @@ AC_SUBST(use_linux_native_aio) use_hwloc=0 AS_IF([test "x$enable_hwloc" = "xyes"], [ # Use pkg-config, because some distros (*cough* Ubuntu) put hwloc in unusual places. - PKG_CHECK_MODULES([hwloc], [hwloc], [ + PKG_CHECK_MODULES([HWLOC], [hwloc], [ SAVE_LIBS="$LIBS" LIBS="-lhwloc" AC_LANG_PUSH([C++]) @@ -1345,8 +1345,8 @@ AS_IF([test "x$enable_hwloc" = "xyes"], [ AC_LINK_IFELSE([ AC_LANG_PROGRAM([#include <hwloc.h>],[hwloc_topology_t t; hwloc_topology_init(&t); hwloc_get_type_depth(t, HWLOC_OBJ_SOCKET);])],[ use_hwloc=1 - AC_SUBST([hwloc_CFLAGS]) - AC_SUBST([hwloc_LIBS]) + AC_SUBST([HWLOC_CFLAGS]) + AC_SUBST([HWLOC_LIBS]) AC_MSG_RESULT([yes]) # Old versions of libhwloc don't have HWLOC_OBJ_PU. AC_CHECK_DECL(HWLOC_OBJ_PU, @@ -1356,15 +1356,15 @@ AS_IF([test "x$enable_hwloc" = "xyes"], [ ], [ AC_MSG_RESULT([no]) AC_MSG_WARN([hwloc not linkable, try --disable-hwloc]) - AC_SUBST([hwloc_CFLAGS],[""]) - AC_SUBST([hwloc_LIBS],[""]) + AC_SUBST([HWLOC_CFLAGS],[""]) + AC_SUBST([HWLOC_LIBS],[""]) ]) AC_LANG_POP() LIBS="$SAVE_LIBS" ], [ AC_MSG_WARN([hwloc not found, try --disable-hwloc]) - AC_SUBST([hwloc_CFLAGS],[""]) - AC_SUBST([hwloc_LIBS],[""]) + AC_SUBST([HWLOC_CFLAGS],[""]) + AC_SUBST([HWLOC_LIBS],[""]) ]) ]) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/iocore/aio/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am index e2463cd..db25e37 100644 --- a/iocore/aio/Makefile.am +++ b/iocore/aio/Makefile.am @@ -56,4 +56,4 @@ test_AIO_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ - @LIBTCL@ @hwloc_LIBS@ + @LIBTCL@ @HWLOC_LIBS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/iocore/eventsystem/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am index 87c221f..cfa77e1 100644 --- a/iocore/eventsystem/Makefile.am +++ b/iocore/eventsystem/Makefile.am @@ -90,7 +90,7 @@ test_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ - @LIBTCL@ @hwloc_LIBS@ + @LIBTCL@ @HWLOC_LIBS@ test_Buffer_SOURCES = \ test_Buffer.cc http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/lib/ts/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am index 31a0fff..73b04ad 100644 --- a/lib/ts/Makefile.am +++ b/lib/ts/Makefile.am @@ -30,7 +30,7 @@ lib_LTLIBRARIES = libtsutil.la libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@ libtsutil_la_LIBADD = \ - @hwloc_LIBS@ \ + @HWLOC_LIBS@ \ @LIBOBJS@ \ @LIBPCRE@ \ @OPENSSL_LIBS@ \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/54db32b2/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index 0493e85..a2622f9 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -103,7 +103,7 @@ traffic_manager_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/proxy/shared/liberror.a \ $(top_builddir)/proxy/shared/libdiagsconfig.a \ - @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ @hwloc_LIBS@ \ + @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/54db32b2/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 739840a..e40c8e9 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -218,7 +218,7 @@ traffic_server_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(which_libts) \ $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) \ - @hwloc_LIBS@ \ + @HWLOC_LIBS@ \ @LIBPCRE@ \ @OPENSSL_LIBS@ \ @LIBTCL@ \ @@ -250,7 +250,7 @@ traffic_logcat_LDADD = \ $(top_builddir)/lib/records/librecprocess.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \ + @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm traffic_logstats_SOURCES = logstats.cc @@ -266,7 +266,7 @@ traffic_logstats_LDADD = \ $(top_builddir)/lib/records/librecprocess.a \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \ + @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm traffic_sac_SOURCES = \ @@ -322,7 +322,7 @@ traffic_sac_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/records/librecprocess.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \ + @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @HWLOC_LIBS@ \ @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm if BUILD_TESTS
