diff --git a/mcrouter/m4/ax_boost_context.m4 b/mcrouter/m4/ax_boost_context.m4 index 495c3f2fb..a5ab22927 100644 --- a/mcrouter/m4/ax_boost_context.m4 +++ b/mcrouter/m4/ax_boost_context.m4 @@ -69,13 +69,19 @@ AC_DEFUN([AX_BOOST_CONTEXT], CXXFLAGS_SAVE=$CXXFLAGS AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[@%:@include -#include + [[@%:@include +#if BOOST_VERSION >= 106100 +#include +#else +#include +#endif ]], - [[#if BOOST_VERSION >= 105600 - boost::context::fcontext_t fc = boost::context::make_fcontext(0, 0, 0); + [[#if BOOST_VERSION >= 106100 + boost::context::detail::fcontext_t fc = boost::context::detail::make_fcontext(0, 0, 0); +#elif BOOST_VERSION >= 105600 + boost::context::fcontext_t fc = boost::context::make_fcontext(0, 0, 0); #else - boost::context::fcontext_t* fc = boost::context::make_fcontext(0, 0, 0); + boost::context::fcontext_t* fc = boost::context::make_fcontext(0, 0, 0); #endif ]] )], @@ -128,3 +134,4 @@ AC_DEFUN([AX_BOOST_CONTEXT], LDFLAGS="$LDFLAGS_SAVED" fi ]) + diff --git a/mcrouter/scripts/install_debian_9.3.sh b/mcrouter/scripts/install_debian_9.3.sh new file mode 100755 index 000000000..bb44bba07 --- /dev/null +++ b/mcrouter/scripts/install_debian_9.3.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +set -ex + +[ -n "$1" ] || ( echo "Install dir missing"; exit 1 ) + +sudo apt-get update + +sudo apt-get install -y \ + autoconf \ + autoconf-archive \ + automake \ + binutils-dev \ + cmake \ + g++ \ + gcc \ + git \ + googletest \ + libboost-all-dev \ + libcap-dev \ + libdouble-conversion-dev \ + libdwarf-dev \ + libelf-dev \ + libevent-dev \ + libgflags-dev \ + libgoogle-glog-dev \ + libgtest-dev \ + libiberty-dev \ + libjemalloc-dev \ + liblz4-dev \ + liblzma-dev \ + libsnappy-dev \ + libssl-dev \ + libssl1.0.2 \ + libtool \ + libunwind8-dev \ + make \ + pkg-config \ + ragel \ + scons \ + sudo \ + unzip \ + zlib1g-dev + +cd "$(dirname "$0")" || ( echo "cd fail"; exit 1 ) + +./get_and_build_everything.sh debian-9.3 "$@" diff --git a/mcrouter/scripts/order_debian-9.3/10_folly b/mcrouter/scripts/order_debian-9.3/10_folly new file mode 120000 index 000000000..7afbfeed8 --- /dev/null +++ b/mcrouter/scripts/order_debian-9.3/10_folly @@ -0,0 +1 @@ +../recipes/folly.sh \ No newline at end of file diff --git a/mcrouter/scripts/order_debian-9.3/12_wangle b/mcrouter/scripts/order_debian-9.3/12_wangle new file mode 120000 index 000000000..8366c0300 --- /dev/null +++ b/mcrouter/scripts/order_debian-9.3/12_wangle @@ -0,0 +1 @@ +../recipes/wangle.sh \ No newline at end of file diff --git a/mcrouter/scripts/order_debian-9.3/20_mcrouter b/mcrouter/scripts/order_debian-9.3/20_mcrouter new file mode 100755 index 000000000..8d64b622c --- /dev/null +++ b/mcrouter/scripts/order_debian-9.3/20_mcrouter @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +source common.sh + +# clone the latest gtest +[ -d googletest ] || git clone https://github.com/google/googletest.git + +cd "$SCRIPT_DIR/../.." || die "cd fail" + +# copy gtest source into lib/gtest folder +mkdir -p ./lib/gtest +cp -r -f -t ./lib/gtest "$PKG_DIR/googletest/googletest"/* + +autoreconf --install +LD_LIBRARY_PATH="$INSTALL_DIR/lib:$LD_LIBRARY_PATH" \ + LD_RUN_PATH="$INSTALL_DIR/lib:$LD_RUN_PATH" \ + LDFLAGS="-L$INSTALL_DIR/lib $LDFLAGS" \ + CPPFLAGS="-I$INSTALL_DIR/include $CPPFLAGS" \ + LIBS=/usr/lib/x86_64-linux-gnu/libssl.so.1.0.2 \ + ./configure --prefix="$INSTALL_DIR" +make $MAKE_ARGS && make install $MAKE_ARGS