01a64f9d63b8d29bee782ced4e5ce16260089649 markd Fri Dec 18 15:37:24 2020 -0800 fix hgTracks bring in uncommon shared library with HAL/HDF5, make CGIs less portable diff --git src/inc/common.mk src/inc/common.mk index b7eb576..d19526f 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -56,41 +56,44 @@ else ifneq ($(wildcard /opt/local/lib/libiconv.a),) ICONVLIB=/opt/local/lib/libiconv.a else ICONVLIB=-liconv endif endif # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif # autodetect UCSC installation of hal: ifeq (${HALDIR},) - HALDIR = /hive/groups/browser/hal/build/hal.2020-12-13 + HALDIR = /hive/groups/browser/hal/build/hal.2020-12-18 ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) - HDF5LIBS=/usr/lib64/libhdf5_cpp.a /usr/lib64/libhdf5.a /usr/lib64/libhdf5_hl.a - HALLIBS=${HALDIR}/hal/lib/libHalBlockViz.a ${HALDIR}/hal/lib/libHalMaf.a ${HALDIR}/hal/lib/libHalLiftover.a ${HALDIR}/hal/lib/libHalLod.a ${HALDIR}/hal/lib/libHal.a ${HALDIR}/sonLib/lib/sonLib.a ${HDF5LIBS} -lcurl -lsz -lstdc++ + # force static libraries to keep programs portable + HDF5DIR=/hive/groups/browser/hal/build/hdf5-1.12.0 + HDF5LIBDIR=${HDF5DIR}/local/lib + HDF5LIBS=${HDF5LIBDIR}/libhdf5_cpp.a ${HDF5LIBDIR}/libhdf5.a ${HDF5LIBDIR}/libhdf5_hl.a + HALLIBS=${HALDIR}/hal/lib/libHalBlockViz.a ${HALDIR}/hal/lib/libHalMaf.a ${HALDIR}/hal/lib/libHalLiftover.a ${HALDIR}/hal/lib/libHalLod.a ${HALDIR}/hal/lib/libHal.a ${HALDIR}/sonLib/lib/sonLib.a ${HDF5LIBS} -lcurl -lstdc++ HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc -I${HALDIR}/hal/blockViz/inc endif # on hgwdev, include HAL by defaults ifeq (${IS_HGWDEV},yes) L+=${HALLIBS} endif ifeq (${USE_HIC},) USE_HIC=1 endif ifeq (${USE_HIC},1) HG_DEFS+=-DUSE_HIC endif