You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/03/03 23:31:30 UTC
[2/2] git commit: TS-2607: Fix TS_USE_HWLOC #define in build process
TS-2607: Fix TS_USE_HWLOC #define in build process
(cherry picked from commit 3b3461edf835719e24d9cf2b2c74969d9a8ee012)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bc6625fa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bc6625fa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bc6625fa
Branch: refs/heads/4.2.x
Commit: bc6625fa09e7b9c5a6518a617498e05ec1bb9cf0
Parents: aa191f8
Author: Phil Sorber <so...@apache.org>
Authored: Mon Mar 3 15:15:17 2014 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Mon Mar 3 15:30:47 2014 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc6625fa/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a9c0ed2..2d6b42b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.0
+ *) [TS-2607] Fix TS_USE_HWLOC #define in build process
+
*) [TS-2019] Fix the "vector inconsistency" errors.
*) [TS-2593] HTTPS to origin fails on CentOS6.x. This is a regression of
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bc6625fa/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 05fa46f..7fff7a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1365,7 +1365,7 @@ 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], [use_hwloc=yes], [use_hwloc=no])
+ PKG_CHECK_MODULES([hwloc], [hwloc], [use_hwloc=1], [use_hwloc=0])
AC_SUBST([hwloc_CFLAGS])
AC_SUBST([hwloc_LIBS])
])