aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunfeng Wang <drenfong.wang@intel.com>2019-12-19 16:43:51 +0800
committerJunfeng Wang <drenfong.wang@intel.com>2019-12-19 16:50:02 +0800
commit3a1d30482cb0514fb18bf08590236fd1b3eba418 (patch)
tree3dca6bf06064a9c6a7d7a67ed6db2869e260b2ce
parent6e961a17b6583a8333ee6dbee8dacb827126302c (diff)
fix Makefile typo and use devtoolset-7's absolute path in CAMEv20.05-rc0
Change-Id: I5f001a3db57d1e610da925c349b6558653844db5 Signed-off-by: Junfeng Wang <drenfong.wang@intel.com>
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 483bf27..119f493 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,8 @@ DEB_DEPENDS = curl build-essential autoconf automake ccache git cmake wget coreu
#RPM#
#####
#Dependencies to build
-RPM_DEPENDS = curl autoconf automake ccache cmake3 wget gcc gcc-c++ git gtest gtest-devel ragel python-sphinx boost169-devel
+RPM_DEPENDS = curl autoconf automake ccache cmake3 wget gcc gcc-c++ git gtest gtest-devel
+RPM_DEPENDS += ragel python-sphinx boost169-devel
.PHONY: help install-dep build build-package build-package-hyperscan checkstyle distclean
@@ -61,7 +62,7 @@ endif
@sudo -E apt-get update
@sudo -E apt-get $(APT_ARGS) -y --force-yes install $(DEB_DEPENDS)
else ifeq ($(OS_ID),centos)
- @sudo -E yum install -y $(RPM_DEPENDS) epel-release centos-release-scl
+ @sudo -E yum install -y $(RPM_DEPENDS) epel-release centos-release-scl devtoolset-7
else
$(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
endif
@@ -80,8 +81,9 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
make package -j$(nproc);
else ifeq ($(OS_ID),centos)
@mkdir -p $(BR)/build-package/; cd $(BR)/build-package/;\
- $(cmake) -DCMAKE_BUILD_TYPE=Release -DCMKAE_INSTALL_LIBDIR=lib\
- -DCMAKE_INSTALL_PREFIX=/usr $(WS_ROOT)/;\
+ $(cmake) -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_LIBDIR=lib\
+ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin"\
+ $(WS_ROOT)/;\
make package -j$(nproc);
endif
@# NEW INSTRUCTIONS TO BUILD-PACKAGE MUST BE DECLARED ON A NEW LINE WITH