From 45d5ebf56b6cadcdd1fd2fe353f1e9ab244c9847 Mon Sep 17 00:00:00 2001 From: Gabriel L. Somlo Date: Mar 19 2019 17:09:20 +0000 Subject: fix lib64 false-positive detection on i386, armv7hl --- diff --git a/trellis.spec b/trellis.spec index 7a0c6fd..1f16750 100644 --- a/trellis.spec +++ b/trellis.spec @@ -60,9 +60,11 @@ mv prj%{name}-db-%{commit1} database #%%patch1 -p1 # add "-fPIC -g" to CMAKE_CXX_FLAGS: sed -i '/CMAKE_CXX_FLAGS/s/-O3/-O3 -fPIC -g/' libtrellis/CMakeLists.txt -# fix shebang lines in Python scripts +# prevent "lib64" false positive (e.g., on i386 and armv7hl): +sed -i 's/"lib64"/${LIB_INSTALL_DIR}/' libtrellis/CMakeLists.txt +# fix shebang lines in Python scripts: find . -name \*.py -exec sed -i 's|/usr/bin/env python3|/usr/bin/python3|' {} \; -# remove .gitignore files in examples +# remove .gitignore files in examples: find . -name \.gitignore -delete %build