[rpms/bind] rawhide: Stop using build subdirectory and out-of-tree builds

[rpms/bind] rawhide: Stop using build subdirectory and out-of-tree builds

[@ 2026-07-01 9:47 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/bind
            Branch : rawhide
            Commit : a7c81a2e29803a962ef0ee022930580bd31d4823
            Author : Petr Menšík <pemensik@redhat.com>
            Date   : 2026-06-24T16:05:00+02:00
            Stats  : +4/-33 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/bind/c/a7c81a2e29803a962ef0ee022930580bd31d4823?branch=rawhide

            Log:
            Stop using build subdirectory and out-of-tree builds

Multiple variants are not built in single build for a long time. Using
different builddir causes a lot of issues in test suite. We do not need
nor want subdirectory anymore. Use source directory for building and
test running.

Might need additional adjusts in tests repository on running test suite.

---
diff --git a/bind.spec b/bind.spec
index 9f4d8c5..31b5cde 100644
--- a/bind.spec
+++ b/bind.spec
@@ -392,18 +392,6 @@ sed -e 's, "enable-developer",& \&\& systemctl is-system-running \&>/dev/null \&
 
 
 %build
-## We use out of tree configure/build for export libs
-%define _configure "../configure"
-
-# normal and pkcs11 unit tests
-%define unit_prepare_build() \
-  find lib -name 'K*.key' -exec cp -uv '{}' "%{1}/{}" ';' \
-  find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
-  find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
-
-%define systemtest_prepare_build() \
-  cp -Tuav bin/tests "%{1}/bin/tests/" \
-
 %if %{with OPENSSL_ENGINE}
 CPPFLAGS="$CPPFLAGS -DOPENSSL_API_COMPAT=10100"
 %else
@@ -425,9 +413,6 @@ configure.ac
 
 autoreconf --force --install
 
-mkdir build
-
-pushd build
 LIBDIR_SUFFIX=
 export LIBDIR_SUFFIX
 %configure \
@@ -465,12 +450,6 @@ export LIBDIR_SUFFIX
   --enable-full-report \
   CPPFLAGS="$CPPFLAGS" PROGRAM_SUFFIX="%{program_suffix}" \
 ;
-%if %{with DNSTAP}
-  pushd lib
-  SRCLIB="../../../lib"
-  (cd dns && ln -s ${SRCLIB}/dns/dnstap.proto)
-  popd
-%endif
 
 %if %{with DOCPDF}
 # avoid using home for pdf latex files
@@ -486,8 +465,6 @@ fmtutil-user --missing || :
   make doc
 %endif
 
-popd # build
-
 # Prepare unit files
 for SERVICEFILE in %{SOURCE37} %{SOURCE38} %{SOURCE44} %{SOURCE46}; do
   NEWNAME="$(basename -- "$SERVICEFILE" .in)"
@@ -503,9 +480,6 @@ for SERVICEFILE in %{SOURCE37} %{SOURCE38} %{SOURCE44} %{SOURCE46}; do
   touch -r "$SERVICEFILE" "$NEWNAME" # Set change time to time of template
 done
 
-%unit_prepare_build build
-%systemtest_prepare_build build
-
 %check
 %if %{with UNITTEST} || %{with SYSTEMTEST}
   # Tests require initialization of pkcs11 token
@@ -517,7 +491,6 @@ export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
 %endif
 
 %if %{with UNITTEST}
-  pushd build
   CPUS=$(lscpu -p=cpu,core | grep -v '^#' | wc -l)
   THREADS="$CPUS"
 %if %{without UNITTEST_ALL}
@@ -537,7 +510,6 @@ export TSAN_OPTIONS="log_exe_name=true log_path=ThreadSanitizer exitcode=0"
     exit $e;
   fi;
   [ "$CPUS" -gt 16 ] && ulimit -n $ORIGFILES || :
-  popd
 ## End of UNITTEST
 %endif
 
@@ -566,7 +538,7 @@ rh-allow-sha1-signatures = yes
 EOF
     export OPENSSL_CONF
   %endif
-  pushd build/bin/tests
+  pushd bin/tests
   chown -R ${USER} . # Can be unknown user
   %make_build test
   e=$?
@@ -609,9 +581,7 @@ popd
 touch ${RPM_BUILD_ROOT}/%{chroot_prefix}%{_sysconfdir}/named.conf
 #end chroot
 
-pushd build
 %make_install PROGRAM_SUFFIX="%{program_suffix}"
-popd
 
 # Remove unwanted files
 rm -f ${RPM_BUILD_ROOT}/etc/bind.keys
@@ -670,7 +640,7 @@ popd
 
 %if %{with DOC}
 mkdir -p ${RPM_BUILD_ROOT}%{_pkgdocdir}
-cp -a build/doc/arm/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -a doc/arm/_build/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
 rm -rf ${RPM_BUILD_ROOT}%{_pkgdocdir}/html/.{buildinfo,doctrees}
 # Backward compatible link to 9.11 documentation
 (cd ${RPM_BUILD_ROOT}%{_pkgdocdir} && ln -s html/index.html Bv9ARM.html)
@@ -686,7 +656,7 @@ do
 done
 %endif
 %if %{with DOCPDF}
-cp -p build/doc/arm/_build/latex/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
+cp -p doc/arm/_build/latex/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir}
 %endif
 
 # Ghost config files:
@@ -1257,6 +1227,7 @@ fi;
 - Use alternatives symlinks to provide original names
 - Allow installation of multiple major versions at the same time
 - chroot package still conflicts, might be fixed later
+- Stop using build subdirectory and out-of-tree builds
 
 * Wed Jun 17 2026 Petr Menšík <pemensik@redhat.com> - 32:9.18.50-1
 - Update to 9.18.50 (rhbz#2489833)