Skip to content

Commit

Permalink
Remove build patch for bind9 (#1497)
Browse files Browse the repository at this point in the history
Build patch for Bind was submitted upstream, so we don't need the patch
anymore. We now build with tip of main of Bind9 without any patches.
* https://gitlab.isc.org/isc-projects/bind9/-/issues/4639
  • Loading branch information
samuel40791765 authored Mar 15, 2024
1 parent 372c6a9 commit e248bf5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
19 changes: 0 additions & 19 deletions tests/ci/integration/bind9_patch/bind-fix.patch

This file was deleted.

10 changes: 0 additions & 10 deletions tests/ci/integration/run_bind9_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ source tests/ci/common_posix_setup.sh
SCRATCH_FOLDER="${SRC_ROOT}/BIND9_BUILD_ROOT"
BIND9_SRC_FOLDER="${SCRATCH_FOLDER}/bind9"
BIND9_BUILD_FOLDER="${SCRATCH_FOLDER}/bind9-aws-lc"
BIND9_PATCH_FOLDER=${SRC_ROOT}/"tests/ci/integration/bind9_patch"
AWS_LC_BUILD_FOLDER="${SCRATCH_FOLDER}/aws-lc-build"
AWS_LC_INSTALL_FOLDER="${SCRATCH_FOLDER}/aws-lc-install"

Expand All @@ -34,14 +33,6 @@ function bind9_build() {
make -j ${NUM_CPU_THREADS} -k all
}

# TODO: Remove this when we make an upstream contribution.
function bind9_patch() {
for patchfile in $(find -L "${BIND9_PATCH_FOLDER}" -type f -name '*.patch'); do
echo "Apply patch $patchfile..."
patch -p1 --quiet -i "$patchfile"
done
}

function bind9_run_tests() {
make -j ${NUM_CPU_THREADS} check
}
Expand All @@ -60,7 +51,6 @@ export LD_LIBRARY_PATH="${AWS_LC_INSTALL_FOLDER}/lib"
# Build bind9 from source.
pushd ${BIND9_SRC_FOLDER}

bind9_patch
bind9_build
bind9_run_tests

Expand Down

0 comments on commit e248bf5

Please sign in to comment.