Fix the path to the abc library on 32-bit systems.

Skip a test that exhausts all memory on 32-bit systems.
Work around bz 1688841.
This commit is contained in:
Jerry James 2019-06-13 17:36:50 -06:00
parent ded5ca8205
commit 4e0920c772
2 changed files with 10 additions and 2 deletions

View File

@ -22,7 +22,7 @@
-find_program(ABC_ARCH_FLAGS_PROG
- NAMES arch_flags
- PATHS ${ABC_HOME}
+ PATHS /usr/lib64
+ PATHS /usr/lib64 /usr/lib
NO_DEFAULT_PATH)
-if(ABC_ARCH_FLAGS_PROG)

View File

@ -114,6 +114,11 @@ if [ "%{_lib}" = "lib64" ]; then
sed -i 's/DESTINATION lib/&64/' src/CMakeLists.txt src/parser/CMakeLists.txt
fi
# One test exhausts all memory on 32-bit platforms; skip it
%ifarch %{arm} %{ix86}
sed -i '/replaceall-len-c/d' test/regress/CMakeLists.txt
%endif
%build
export CFLAGS="%{optflags} -fsigned-char -DABC_USE_STDINT_H -I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux -I%{_includedir}/abc"
export CXXFLAGS="$CFLAGS"
@ -166,8 +171,11 @@ mkdir -p %{buildroot}%{_jnidir}/%{name}
cp -p src/bindings/java/libcvc4jni.so %{buildroot}%{_jnidir}/%{name}
%check
# The tests use a large amount of stack space
# The tests use a large amount of stack space.
# Only do this on s390x to workaround bz 1688841.
%ifarch s390x
ulimit -s unlimited
%endif
# Fix the Java test's access to the JNI object it needs
sed 's,loadLibrary("cvc4jni"),load("%{buildroot}%{_jnidir}/%{name}/libcvc4jni.so"),' \