From f1aed0460d3c887fe6a2504575ea8e77b840adb4 Mon Sep 17 00:00:00 2001
From: Joe Garcia <joe.garcia@ssec.wisc.edu>
Date: Wed, 13 Mar 2019 09:46:45 -0500
Subject: [PATCH] fixes for bumps, disable basemap, add openmp for clang builds
---
ShellB3/shallbethree.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh
index a84f28b1..4f12ed26 100755
--- a/ShellB3/shallbethree.sh
+++ b/ShellB3/shallbethree.sh
@@ -2119,8 +2119,9 @@ elif isLinux ; then
fi
export CFLAGS="$CFLAGS -I${BASE}/include $LINUXCPUFLAGS -fno-strict-aliasing ${SB3FLAGS}"
if isTrue USING_CLANG ; then
- export CXXFLAGS="$CXXFLAGS -I${BASE}/include $LINUXCPUFLAGS -fno-strict-aliasing ${SB3FLAGS}"
- export FCFLAGS="$FCFLAGS -I${BASE}/include ${SB3FLAGS}"
+ export CFLAGS="$CFLAGS -O3"
+ export CXXFLAGS="$CXXFLAGS -O3 -I${BASE}/include $LINUXCPUFLAGS -fno-strict-aliasing ${SB3FLAGS}"
+ export FCFLAGS="$FCFLAGS -O2 -I${BASE}/include ${SB3FLAGS}"
fi
export PATH=$BASE/sysbin:$BASE/sb3bin:$BASE/bin:${SYSROOT}/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin
export USE_SYS_ZLIB=YES USE_SYS_JPEG=YES
@@ -6470,9 +6471,10 @@ mk_clang(){
#build latest version of Clang and LLVM. can be a starting point (builds environment needed to build)
resume_tracker && return 0
- mk_full_llvm \
- && mk_lld \
- && BUILD_CLANG=YES mk__clang \
+ CFLAGS="$CFLAGS -O2" CXXFLAGS="$CXXFLAGS -O2" mk_full_llvm \
+ && CFLAGS="$CFLAGS -O2" CXXFLAGS="$CXXFLAGS -O2" mk_lld \
+ && CFLAGS="$CFLAGS -O2" CXXFLAGS="$CXXFLAGS -O2" BUILD_CLANG=YES mk__clang \
+ && mk_llvmopenmp \
&& mk_llvm_rt \
&& echo clang${LLVMVER} >>trim
addDistExclusion bin/clang* bin/opt bin/bugpoint bin/dsymutil bin/c-index-test bin/san* bin/verify-uselistorder \
@@ -7675,11 +7677,11 @@ mk_hpc() {
&& mk_llvm \
&& mk_enum \
&& mk_llvmlite \
+ && mk_hwloc \
+ && mk_openmpi \
&& mk_numba \
&& mk_dsltools \
&& mk_meta \
- && mk_hwloc \
- && mk_openmpi \
&& mk_mpi4py \
&& mk_softopencl \
&& test_opencl \
@@ -8582,7 +8584,7 @@ SCRIPT
_setup_build_install $( _github_retrieved numba numba ${NUMBAREF} ) || oops "numba build failed"
else
- pip_install src/optional/numba-${NUMBAVER}.tar.gz || oops "numba build failed"
+ simple_py_install src/optional/numba-${NUMBAVER}.tar.gz || oops "numba build failed"
fi
}
@@ -8627,7 +8629,6 @@ mk_graphics() {
&& mk_openh264 \
&& mk_libav \
&& mk_matplotlib_batch \
- && mk_basemap \
&& mk_pyshp \
&& mk_shapely \
&& mk_cartopy \
@@ -8753,7 +8754,6 @@ mk_gui() {
&& mk_openh264 \
&& mk_libav \
&& mk_matplotlib \
- && mk_basemap \
&& mk_pyshp \
&& mk_shapely \
&& mk_cartopy \
--
GitLab