rpms
/
bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

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
This commit is contained in:
Petr Menšík 2018-02-07 12:21:15 +01:00
parent 46c6c4cd84
commit 6787c0592a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bind.spec
View File

@ -142,7 +142,7 @@ BuildRequires: systemd
# needed for %%{__python3} macro # needed for %%{__python3} macro
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-ply BuildRequires: python3-ply
BuildRequires: findutils BuildRequires: findutils sed
%if %{SDB} %if %{SDB}
BuildRequires: openldap-devel, postgresql-devel, sqlite-devel, mariadb-connector-c-devel BuildRequires: openldap-devel, postgresql-devel, sqlite-devel, mariadb-connector-c-devel
BuildRequires: libdb-devel BuildRequires: libdb-devel
@ -653,6 +653,9 @@ lib/Makefile
for lib in %{bind_export_libs} for lib in %{bind_export_libs}
do do
find . -name Makefile -exec sed "s/lib${lib}\./lib${lib}-export\./g" -i {} \; 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; done;
%{__patch} -p2 -b --suffix .export-isc-config < %{PATCH135} %{__patch} -p2 -b --suffix .export-isc-config < %{PATCH135}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -660,6 +663,9 @@ popd
# export library unit tests # export library unit tests
%unit_prepare_build export-libs %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 ## End of export libs
%endif %endif