From c2a2560ea347e785f49f2e3a1ac8ece9db8441bc Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Thu, 15 Mar 2018 09:59:36 +0900 Subject: [PATCH] dist/debian: use 3rdparty ppa on Ubuntu 18.04 Currently Ubuntu 18.04 uses distribution provided g++ and boost, but it's easier to maintain Scylla package to build with same version toolchain/libraries, so switch to them. Signed-off-by: Takuya ASADA Message-Id: <1521075576-12064-1-git-send-email-syuu@scylladb.com> (cherry picked from commit 945e6ec4f624a08bdcd565d9ecc074f486a6ba7a) --- dist/debian/build_deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh index 1d15c1bd98..2274f68b7a 100755 --- a/dist/debian/build_deb.sh +++ b/dist/debian/build_deb.sh @@ -200,7 +200,7 @@ elif [ "$TARGET" = "bionic" ]; then sed -i -e "s/@@INSTALL_FSTRIM@@/dh_installinit --no-start --name scylla-fstrim/g" debian/rules sed -i -e "s/@@INSTALL_NODE_EXPORTER@@/dh_installinit --no-start --name node-exporter/g" debian/rules sed -i -e "s#@@COMPILER@@#g++-7#g" debian/rules - sed -i -e "s/@@BUILD_DEPENDS@@/libsystemd-dev, g++, libunwind-dev, antlr3, scylla-libthrift010-dev, scylla-antlr35-c++-dev, libboost-program-options-dev, libboost-filesystem-dev, libboost-system-dev, libboost-thread-dev, libboost-test-dev/g" debian/control + sed -i -e "s/@@BUILD_DEPENDS@@/libsystemd-dev, scylla-gcc73-g++-7, libunwind-dev, antlr3, scylla-libthrift010-dev, scylla-antlr35-c++-dev, scylla-libboost-program-options165-dev, scylla-libboost-filesystem165-dev, scylla-libboost-system165-dev, scylla-libboost-thread165-dev, scylla-libboost-test165-dev/g" debian/control sed -i -e "s/@@DEPENDS@@/hugepages, /g" debian/control sed -i -e "s#@@INSTALL@@##g" debian/scylla-server.install sed -i -e "s#@@HKDOTTIMER_D@@#dist/common/systemd/scylla-housekeeping-daily.timer /lib/systemd/system#g" debian/scylla-server.install