From 0137d629ca981aac0186bf63bea82c2d5b9d7832 Mon Sep 17 00:00:00 2001 From: Meng Zhang Date: Tue, 23 Aug 2016 15:17:52 -0700 Subject: [PATCH] Make it build on Ubuntu 16.04 Summary: include linux/membarrier.h if it is available. Closes https://github.com/facebook/folly/pull/455 Reviewed By: lukenels Differential Revision: D3714952 Pulled By: Orvid fbshipit-source-id: 8c85756af2cb132152b2182816becfea138f0149 --- folly/configure.ac | 3 ++- folly/portability/SysMembarrier.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/folly/configure.ac b/folly/configure.ac index 115764f2..6e2ad59d 100644 --- a/folly/configure.ac +++ b/folly/configure.ac @@ -524,7 +524,8 @@ AC_CHECK_HEADER([snappy.h], AC_CHECK_LIB([snappy], [main])) AC_CHECK_HEADER([zlib.h], AC_CHECK_LIB([z], [main])) AC_CHECK_HEADER([lzma.h], AC_CHECK_LIB([lzma], [main])) AC_CHECK_HEADER([zstd.h], AC_CHECK_LIB([zstd], [main])) - +AC_CHECK_HEADER([linux/membarrier.h], AC_DEFINE([HAVE_LINUX_MEMBARRIER_H], [1], [Define to 1 if membarrier.h is available])) + AC_ARG_ENABLE([follytestmain], AS_HELP_STRING([--enable-follytestmain], [enables using main function from folly for tests]), [follytestmain=${enableval}], [follytestmain=no]) diff --git a/folly/portability/SysMembarrier.cpp b/folly/portability/SysMembarrier.cpp index 9a3d3073..a0d0d90a 100644 --- a/folly/portability/SysMembarrier.cpp +++ b/folly/portability/SysMembarrier.cpp @@ -28,6 +28,8 @@ #define __NR_membarrier 324 #define MEMBARRIER_CMD_QUERY 0 #define MEMBARRIER_CMD_SHARED 1 +#elif FOLLY_HAVE_LINUX_MEMBARRIER_H +#include #endif #endif -- 2.34.1