Make module removal (unbundling) more strict

Failures from removing bundled expat or zlib should not be silent;
if they occur they should be investigated.

Also, reword the comments for conciseness
This commit is contained in:
Petr Viktorin 2017-08-28 17:38:51 +02:00
parent 9faeaef40a
commit 3a884e4af3
1 changed files with 3 additions and 7 deletions

View File

@ -586,13 +586,9 @@ cp -a %{SOURCE6} .
cp -a %{SOURCE7} . cp -a %{SOURCE7} .
%endif # with systemtap %endif # with systemtap
# Ensure that we're using the system copy of various libraries, rather than # Remove bundled libraries to ensure that we're using the system copy.
# copies shipped by upstream in the tarball: rm -r Modules/expat
# Remove embedded copy of expat: rm -r Modules/zlib
rm -r Modules/expat || exit 1
# Remove embedded copy of zlib:
rm -r Modules/zlib || exit 1
## Disabling hashlib patch for now as it needs to be reimplemented ## Disabling hashlib patch for now as it needs to be reimplemented
## for OpenSSL 1.1.0. ## for OpenSSL 1.1.0.