Atf support was removed
cmocka is used instead. Unfortunately it is not packaged in Fedora yet.
This commit is contained in:
parent
1e4169114f
commit
7bc8b1b992
23
bind.spec
23
bind.spec
@ -581,10 +581,9 @@ done
|
||||
|
||||
# normal and pkcs11 unit tests
|
||||
%define unit_prepare_build() \
|
||||
cp -uv Kyuafile Atffile "%{1}/" \
|
||||
cp -uv Kyuafile "%{1}/" \
|
||||
find lib -name 'K*.key' -exec cp -uv '{}' "%{1}/{}" ';' \
|
||||
find lib -name 'Kyuafile' -exec cp -uv '{}' "%{1}/{}" ';' \
|
||||
find lib -name 'Atffile' -exec cp -uv '{}' "%{1}/{}" ';' \
|
||||
find lib -name 'testdata' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
|
||||
find lib -name 'testkeys' -type d -exec cp -Tav '{}' "%{1}/{}" ';' \
|
||||
|
||||
@ -596,8 +595,8 @@ done
|
||||
# Use system installed libatf-c library with kyua tool
|
||||
ATF_PATH=/usr
|
||||
%else
|
||||
# Use bundled atf library with atf-run
|
||||
ATF_PATH=yes
|
||||
# Disable tests, no longer shipped inside
|
||||
ATF_PATH=no
|
||||
%endif
|
||||
|
||||
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
|
||||
@ -698,16 +697,6 @@ pushd bin/python
|
||||
make man
|
||||
popd
|
||||
|
||||
%if ! %{with KYUA}
|
||||
# Do not build atf again for export libs
|
||||
ATF_PATH="`pwd`/unit/atf"
|
||||
|
||||
# Atf libs are built. Prevent their installation
|
||||
sed -i -e \
|
||||
'/^SUBDIRS =/s/atf-src//i' \
|
||||
unit/Makefile
|
||||
%endif
|
||||
|
||||
%if %{with DLZ}
|
||||
pushd contrib/dlz
|
||||
pushd bin/dlzbdb
|
||||
@ -776,10 +765,6 @@ sed -i -e \
|
||||
"/^SUBDIRS =/s/.*/SUBDIRS = %{bind_export_libs}/i" \
|
||||
lib/Makefile
|
||||
|
||||
sed -i -e \
|
||||
'/^SUBDIRS =/s/atf-src//i' \
|
||||
unit/Makefile
|
||||
|
||||
for lib in %{bind_export_libs}
|
||||
do
|
||||
find . -name Makefile -exec sed "s/lib${lib}\./lib${lib}-export\./g" -i {} \;
|
||||
@ -796,8 +781,6 @@ popd
|
||||
# Do not try pkcs11 and lwres in export libs
|
||||
sed -e '/^\s*include(.*-pkcs11/ d' -e '/^\s*include(.*lwres/ d' \
|
||||
-i export-libs/lib/Kyuafile
|
||||
sed -e '/^tp:.*-pkcs11/ d' -e '/^tp:\s*lwres/ d' \
|
||||
-i export-libs/lib/Atffile
|
||||
|
||||
## End of export libs
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user