diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 7f335d03cb070ea92b07cc5e3df3c7ec346831b0..ef11b6749863e5dda9c53f14b2cbf988f63298d2 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -8587,18 +8587,40 @@ mk_llvmlite() { #pip_install src/optional/funcsigs-*.tar.gz || oops 'funcsigs did not install' pip_install src/optional/argparse-*.tar.gz || oops 'argparse did not install' + make_patch llvmlite <<PATCH +--- ffi/transforms.cpp 2021-03-15 11:07:14.000000000 -0500 ++++ ffi/transforms.cpp 2021-03-15 11:07:51.000000000 -0500 +@@ -6,6 +6,7 @@ + + extern "C" { + ++#if LLVM_VERSION_MAJOR <= 10 + namespace llvm { + inline PassManagerBuilder *unwrap(LLVMPassManagerBuilderRef P) { + return reinterpret_cast<PassManagerBuilder*>(P); +@@ -15,6 +16,7 @@ + return reinterpret_cast<LLVMPassManagerBuilderRef>(P); + } + } ++#endif + + + API_EXPORT(LLVMPassManagerBuilderRef) +PATCH + make_script llvmlite <<SCRIPT sed -e 's,MACOSX_DEPLOYMENT_TARGET=10.7 ,,g' -e 's, -stdlib=libc++,,g' \ -e "s^CXXFLAGS = ^CXXFLAGS = ${CXXFLAGS} ${CPPFLAGS} -I${BASE}/include ^g" \ -e "s^LDFLAGS = ^LDFLAGS = ${LDFLAGS} ^g" -e "s,-static-libstdc++,,g" \ -e "s, $( echo $CXX | awk '{print $1}' | xargs basename ) , $( echo $CXX | awk '{print $1}' ) ,g" \ -e "s^-shared^-shared ${LINUXCPUFLAGS}^g" -i.old ffi/Makefile.* + sed -i.old2 -e "s,N_MAJOR == 10,N_MAJOR >= 10,g" ffi/custom_passes.cpp SCRIPT if [ -n "${LLVMLITEREF}" ] ; then - _setup_build_install $( _github_retrieved numba llvmlite ${LLVMLITEREF} ) || oops 'llvmlite did not install' + LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 _setup_build_install $( _github_retrieved numba llvmlite ${LLVMLITEREF} ) || oops 'llvmlite did not install' else - _setup_build_install llvmlite src/optional/llvmlite-${LLVMLITEVER}.tar.* llvmlite-${LLVMLITEVER} || oops 'llvmlite did not install' + LLVMLITE_SKIP_LLVM_VERSION_CHECK=1 _setup_build_install llvmlite src/optional/llvmlite-${LLVMLITEVER}.tar.* llvmlite-${LLVMLITEVER} || oops 'llvmlite did not install' fi reid $( find ${BASE}/*ib* -type f -name libllvmlite* ) return 0