diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-11-20 19:18:22 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-11-30 20:58:43 +0100 |
| commit | 568fc1b638c3f55b5b79f8eb6effba75c65cf290 (patch) | |
| tree | 2d8462091719f1ff86d05474658c8731a36d960c /helper | |
| parent | b67a28bee3bae6918e7ca81b6a391763f1e8e5da (diff) | |
cunit: don't build CUnit if its a native build
Sinse ODP commit '605ed61: validation: remove strict dependency on CUnit
2.1-3' theres no dependency on CUnit 2.1-3.
However, its still a dependency for build-dpdk.
Reviewed-by: Mike Holmes <mike.holmes@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/cunit | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/helper/cunit b/helper/cunit index 5f4dfe6..81065aa 100644 --- a/helper/cunit +++ b/helper/cunit @@ -9,9 +9,11 @@ CUNIT_VERSION="${CUNIT_VERSION:-"2.1-3"}" VALIDATION="${VALIDATION:-"1"}" export CUNIT_SRCDIR=${SRCDIR}/cunit-${CUNIT_VERSION} export CUNIT_BUILDDIR=${BUILDDIR}/cunit +export CUNIT_BUILD=${CUNIT_BUILD:-0} cunit_usage() { + echo -e "\tCUNIT_BUILD:\t build custom CUnit, default: 0" echo -e "\tCUNIT_VERSION:\t Change version from sourceforge.net, default: ${CUNIT_VERSION}" echo -e "\tVALIDATION:\t set 0 to disable building validation tests, default: 1" } @@ -24,9 +26,13 @@ SF_CUNIT=${SF_CUNIT:-http://people.linaro.org/~anders.roxell/CUnit/${CUNIT_VERSI build_cunit() { if [[ ${VALIDATION} -eq 1 ]]; then + export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-test-vald" + # if CUnit is installed + [[ -n ${ARCH} ]] && CUNIT_BUILD=1 + [[ ${CUNIT_BUILD} -ne 1 ]] && return export CUNIT_INSTALLDIR=${CUNIT_INSTALLDIR:-${ROOT_DIR}/installed/${BASE_ARCH}/cunit-${CUNIT_VERSION}} echo "Building CUnit-${CUNIT_VERSION}" - export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-test-vald --with-cunit-path=${CUNIT_INSTALLDIR}" + export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --with-cunit-path=${CUNIT_INSTALLDIR}" [[ -f ${CUNIT_INSTALLDIR}/lib/libcunit.a ]] && return if [[ ${M32_ON_64} -eq 1 ]]; then |