Remove spurious rpaths (bz 1967190).

- Fix broken jar symlink.
- Add missing executable bit to python shared object.
This commit is contained in:
Jerry James 2021-06-02 10:07:41 -06:00
parent dd5c1081eb
commit d5a565229c
1 changed files with 14 additions and 2 deletions

View File

@ -3,9 +3,11 @@
Name: cvc4
Version: 1.8
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Automatic theorem prover for SMT problems
%global jar_version %{version}.0
# License breakdown:
# - Files containing code under the Boost license:
# o src/util/channel.h
@ -141,6 +143,8 @@ export CXXFLAGS="$CFLAGS"
-DBUILD_SWIG_BINDINGS_JAVA:BOOL=ON \
-DBUILD_SWIG_BINDINGS_PYTHON:BOOL=ON \
-DCMAKE_JAVA_COMPILE_FLAGS:STRING="-source;1.8;-target;1.8" \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
-DENABLE_GPL:BOOL=ON \
-DENABLE_OPTIMIZED:BOOL=ON \
-DENABLE_PORTFOLIO:BOOL=ON \
@ -189,7 +193,7 @@ ln -s ../../%{_lib}/libcvc4jni.so %{buildroot}%{_jnidir}/%{name}
# Fix a symlink that points to the build directory
rm %{buildroot}%{_javadir}/%{name}/CVC4.jar
ln -s CVC4-%{version}.jar %{buildroot}%{_javadir}/%{name}/CVC4.jar
ln -s CVC4-%{jar_version}.jar %{buildroot}%{_javadir}/%{name}/CVC4.jar
# The cython interface is installed into the wrong directory
if [ "%{python3_sitelib}" != "%{python3_sitearch}" ]; then
@ -197,6 +201,9 @@ if [ "%{python3_sitelib}" != "%{python3_sitearch}" ]; then
rm -fr %{buildroot}%{prefix}/lib/python3*
fi
# Add a missing executable bit
chmod 0755 %{buildroot}%{python3_sitearch}/pycvc4/pycvc4.so
# The 32-bit builders run out of memory while running the test suite. Only
# run tests on 64-bit builders
%ifnarch %{arm} %{ix86}
@ -247,6 +254,11 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%{python3_sitearch}/pycvc4*
%changelog
* Wed Jun 2 2021 Jerry James <loganjerry@gmail.com> - 1.8-5
- Remove spurious rpaths (bz 1967190)
- Fix broken jar symlink
- Add missing executable bit to python shared object
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild