From 6787c0592ab8a8ce6458caa5693f32cfa337b965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Wed, 7 Feb 2018 12:21:15 +0100 Subject: [PATCH] Skip pkcs11 unit tests in export library Modify also export configure script to use real libraries Make sure only the replaced library is changed to export --- bind.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bind.spec b/bind.spec index 906be2a..0803999 100644 --- a/bind.spec +++ b/bind.spec @@ -142,7 +142,7 @@ BuildRequires: systemd # needed for %%{__python3} macro BuildRequires: python3-devel BuildRequires: python3-ply -BuildRequires: findutils +BuildRequires: findutils sed %if %{SDB} BuildRequires: openldap-devel, postgresql-devel, sqlite-devel, mariadb-connector-c-devel BuildRequires: libdb-devel @@ -653,6 +653,9 @@ lib/Makefile for lib in %{bind_export_libs} do find . -name Makefile -exec sed "s/lib${lib}\./lib${lib}-export\./g" -i {} \; + sed -e "s/-l${lib}\([^[:alpha:]]\)/-l${lib}-export\1/g" \ + -e "s/lib${lib}\./lib${lib}-export\./g" \ + -i isc-config.sh done; %{__patch} -p2 -b --suffix .export-isc-config < %{PATCH135} make %{?_smp_mflags} @@ -660,6 +663,9 @@ popd # export library unit tests %unit_prepare_build export-libs +# Do not try pkcs11 in export libs +sed -e '/^\s*include(.*-pkcs11/ d' -e '/^\s*include(.*lwres/ d' \ + -i export-libs/lib/Kyuafile ## End of export libs %endif