Verified Commit 3f6cc254 authored by Michal Nowak's avatar Michal Nowak
Browse files

Install BIND with "make DESTDIR=<PATH> install"

BIND installation should be done by setting DESTDIR during "make
install" not by setting prefix via ./configure.

Make sure that installation with DESTDIR=<PATH> works by checking that
it installed the named binary and it's respective man page to a
well-known place.

Also rename install path variable from BIND_INSTALL_PATH to
INSTALL_PATH to avoid namespace clash in stress tests which use
BIND_INSTALL_PATH variable to configure path to BIND9 binaries.
parent 70b03925
Pipeline #69888 passed with stages
in 18 minutes and 56 seconds
...@@ -34,7 +34,7 @@ variables: ...@@ -34,7 +34,7 @@ variables:
WITH_READLINE_LIBEDIT: "--with-readline=libedit" WITH_READLINE_LIBEDIT: "--with-readline=libedit"
WITH_READLINE_READLINE: "--with-readline=readline" WITH_READLINE_READLINE: "--with-readline=readline"
BIND_INSTALL_PATH: "${CI_PROJECT_DIR}/.local" INSTALL_PATH: "${CI_PROJECT_DIR}/.local"
# In multithreaded unit tests, abort on the first failure # In multithreaded unit tests, abort on the first failure
CMOCKA_TEST_ABORT: 1 CMOCKA_TEST_ABORT: 1
...@@ -214,7 +214,6 @@ stages: ...@@ -214,7 +214,6 @@ stages:
--with-cmocka \ --with-cmocka \
--with-libxml2 \ --with-libxml2 \
--with-json-c \ --with-json-c \
--prefix="${BIND_INSTALL_PATH}" \
$EXTRA_CONFIGURE \ $EXTRA_CONFIGURE \
|| (test -s config.log && cat config.log; exit 1) || (test -s config.log && cat config.log; exit 1)
...@@ -243,8 +242,9 @@ stages: ...@@ -243,8 +242,9 @@ stages:
- *configure - *configure
- *check_readline_setup - *check_readline_setup
- make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1 - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
- test -z "${RUN_MAKE_INSTALL}" || make install - test -z "${RUN_MAKE_INSTALL}" || make DESTDIR="${INSTALL_PATH}" install
- test -z "${RUN_MAKE_INSTALL}" || sh util/check-make-install - test -z "${RUN_MAKE_INSTALL}" || DESTDIR="${INSTALL_PATH}" sh util/check-make-install
- test -z "${RUN_MAKE_INSTALL}" || ls -l "${INSTALL_PATH}"/usr/local/{share/man/man8/named.8,sbin/named}
- if [[ "${CFLAGS}" == *"-fsanitize=address"* ]]; then ( ! grep -F AddressSanitizer config.log ); fi - if [[ "${CFLAGS}" == *"-fsanitize=address"* ]]; then ( ! grep -F AddressSanitizer config.log ); fi
- if test -z "${OUT_OF_TREE_WORKSPACE}" && test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi - if test -z "${OUT_OF_TREE_WORKSPACE}" && test "$(git status --porcelain | grep -Ev '\?\?' | wc -l)" -gt "0"; then git status --short; exit 1; fi
after_script: after_script:
...@@ -1343,10 +1343,10 @@ respdiff: ...@@ -1343,10 +1343,10 @@ respdiff:
- *setup_interfaces - *setup_interfaces
- *setup_softhsm - *setup_softhsm
- make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1 - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
- make install - make DESTDIR="${INSTALL_PATH}" install
- git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git - git clone --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.isc.org/isc-private/bind-qa.git
- cd bind-qa/bind9/stress - cd bind-qa/bind9/stress
- DIG="${BIND_INSTALL_PATH}/bin/dig" WORKSPACE="${CI_PROJECT_DIR}" bash stress.sh - LD_LIBRARY_PATH="${INSTALL_PATH}/usr/local/lib" BIND_INSTALL_PATH="${INSTALL_PATH}/usr/local" WORKSPACE="${CI_PROJECT_DIR}" bash stress.sh
needs: needs:
- job: autoreconf - job: autoreconf
artifacts: true artifacts: true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment