diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 804325452f3c9e7d09277a29635e307608f06fab..c8c8a20d01bb7038c40a8154bccbcf689b88dfb1 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -468,7 +468,7 @@ if [ -n "$COTS_HOME" ]; then else export LD_LIBRARY_PATH="$BASE/lib" fi - + export LIBRARY_PATH="$BASE/lib" export ISLVER=0.14 export GMPVER=5.1.3 @@ -511,6 +511,8 @@ fi if [ -n "$COTS_HOME" ]; then export PKG_CONFIG_PATH="${COTS_HOME}/lib/pkgconfig:${PKG_CONFIG_PATH}" fi +export PKG_CONFIG_PATH="${BASE}/lib/pkgconfig" +export PKG_CONFIG="${BASE}/sysbin/pkg-config" export LAPACKVER=3.5.0 export NUMPYVER=1.10.2rc1 @@ -1467,7 +1469,7 @@ elif isLinux ; then fi if [ -n "$( echo "x86_64 i386 i686" | grep "${CPUTYPE}" )" ] ; then - export LINUXCPUFLAGS="-fPIC -msse4a" + export LINUXCPUFLAGS="-fPIC -msse4a -L${BASE}/lib -I${BASE}/include" else export LINUXCPUFLAGS="-fPIC" fi @@ -1516,6 +1518,8 @@ elif isLinux ; then else echo Unknown linux distribution $(LinuxDistroName). Being cautious fi + unset USE_SYS_ZLIB + # else echo "Unknown OS" @@ -1750,14 +1754,15 @@ mk_sqlite() { # sqlite-autoconf-3071200.tar.gz mk_jpeg() { resume_tracker && return 0 - [ "$USE_SYS_JPEG" == "YES" ] && return 0 +# [ "$USE_SYS_JPEG" == "YES" ] && return 0 #_find_cots JPEG include/jpeglib.h $BASE $COTS_HOME && return 0 _configure_make_install libjpeg src/optional/jpegsrc.v${JPEGVER}.tar.gz jpeg-${JPEGVER} } mk_tiff() { + resume_tracker && return 0 - [ "$USE_SYS_TIFF" == "YES" ] && return 0 + #[ "$USE_SYS_TIFF" == "YES" ] && return 0 #_find_cots TIFF include/tiff.h $BASE $COTS_HOME && return 0 _find_cots ZLIB include/zlib.h $BASE $COTS_HOME ${SYSROOT}/usr || oops "TIFF requires zlib" _find_cots JPEG include/jpeglib.h $BASE $COTS_HOME ${SYSROOT}/usr || oops "TIFF needs JPEG" @@ -1770,7 +1775,7 @@ mk_tiff() { mk_png() { resume_tracker && return 0 - [ "$USE_SYS_PNG" == "YES" ] && return 0 + #[ "$USE_SYS_PNG" == "YES" ] && return 0 #_find_cots PNG bin/libpng-config $BASE $COTS_HOME && return 0 _find_cots ZLIB include/zlib.h $BASE $COTS_HOME ${SYSROOT}/usr || oops "PNG requires zlib" # PNGlib, you are a yutz. @@ -3078,11 +3083,18 @@ mk_cairo() { _find_cots ZLIB include/zlib.h $BASE $COTS_HOME ${SYSROOT}/usr || oops "cairo needs ZLIB" _find_cots PNG bin/libpng-config $BASE $COTS_HOME ${SYSROOT}/usr || oops 'cairo needs PNG' _find_cots THINEPKGCONFIG pkg-config $BASE/sysbin /usr/bin /usr/local/bin /opt/bin || mk_pkgconfig #shouldn't use /sw's. will get fink dependency - CAIROADDITIONALFLAGS="--enable-pthread=yes" - isDarwin && CAIROADDITIONALFLAGS="${CAIROADDITIONALFLAGS} --enable-xlib=no --enable-quartz-image" - _configure_make_install cairo src/optional/cairo-${CAIROVER}.tar.* cairo-${CAIROVER} ${CAIROADDITIONALFLAGS} + + CAIROADDITIONALFLAGS="--enable-pthread=yes " + isDarwin && CAIROADDITIONALFLAGS="${CAIROADDITIONALFLAGS} - --enable-xlib=no --enable-quartz-image " + + _configure_make_install cairo src/optional/cairo-${CAIROVER}.tar.* cairo-${CAIROVER} ${CAIROADDITIONALFLAGS} + } + + + + mk_pycairo() { resume_tracker && return 0 name=pycairo @@ -3425,7 +3437,7 @@ mk_libffi() { } mk_sodium() { - resume_tracker && return 0 + resume_tracker && return _configure_make_install libsodium src/optional/libsodium-${SODIUMVER}.tar.gz libsodium-${SODIUMVER} } @@ -5705,8 +5717,10 @@ mk_astro() { # used by CSPP, includes batch graphics support for quicklooks mk_cspp() { resume_tracker && return 0 - assert MAKE_PYTHON3 - mk_core \ + #assert MAKE_PYTHON3 + mk_zlib \ + && mk_png \ + && mk_core \ && mk_graphics \ && mk_hdf4 && mk_pyhdf \ && mk_netcdf4 && mk_pycdf && mk_netcdf4py \