2e3e23a8d6eec56fe9b1daaea1ca59d37bc01e27 jcasper Fri May 30 11:57:05 2025 -0700 Fix for USE_HAL=0 build. lcurl now needed everywhere because cart.c depends on it, refs #35790 diff --git src/inc/common.mk src/inc/common.mk index 11447d291da..33232fd2c7e 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -223,31 +223,31 @@ endif endif ifeq (${USE_HAL},1) # 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} ${ZLIB} ifeq (${HOSTNAME},hgwdev) HALLIBS += ${OURSTUFF}/lib/libcurl.a /usr/lib/gcc/x86_64-redhat-linux/11/libstdc++.a else ifeq (${HOSTNAME},hgwdev-old.gi.ucsc.edu) HALLIBS += ${OURSTUFF}/lib/libcurl.a /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a else - HALLIBS += -lcurl -lstdc++ + HALLIBS += -lstdc++ endif endif 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) @@ -372,31 +372,31 @@ ifneq (${SSLLIB},) L+=${SSLLIB} else L+=-lssl endif ifneq (${CRYPTOLIB},) L+=${CRYPTOLIB} else L+=-lcrypto endif endif endif #global external libraries L += $(kentSrc)/htslib/libhts.a -L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} +L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} -lcurl HG_INC+=${PNGINCL} # NOTE: these must be last libraries and must be dynamic. # We switched by to dynamic with SEMI_STATIC ifeq (${SEMI_STATIC},yes) # switch back to dynamic libraries DYNAMIC_PRE = -Wl,-Bdynamic endif DYNAMIC_LIBS = ${DYNAMIC_PRE} -ldl -lm -lc L+= ${DYNAMIC_LIBS} # pass through COREDUMP ifneq (${COREDUMP},)