af130dd8140ae4fe925032e9534e4adbb2f9f901 galt Tue Jan 27 14:30:54 2026 -0800 Restoring static curl. refs #35988 diff --git src/inc/common.mk src/inc/common.mk index 087a90fca67..dd5b664e328 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -218,34 +218,34 @@ ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) USE_HAL=1 endif endif 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 + HALLIBS += /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 + HALLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a else 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 @@ -334,30 +334,31 @@ ifeq (${BZ2LIB},) ifneq ($(wildcard /lib64/libbz2.a),) BZ2LIB=/lib64/libbz2.a else BZ2LIB=-lbz2 endif endif # on hgwdev, use the static libraries ifeq (${IS_HGWDEV},yes) HG_INC += -I${OURSTUFF}/include HG_INC += -I${OURSTUFF}/include/mariadb FULLWARN = yes L+=/hive/groups/browser/freetype/freetype-2.10.0/objs/.libs/libfreetype.a + L+=${OURSTUFF}/lib/libcurl.a L+=${OURSTUFF}/lib64/libssl.a ${OURSTUFF}/lib64/libcrypto.a ifeq (${HOSTNAME},hgwdev) PNGLIB=${OURSTUFF}/lib/libpng.a PNGINCL=-I${OURSTUFF}/include/libpng16 else PNGLIB=/usr/lib64/libpng.a PNGINCL=-I/usr/include/libpng15 endif MYSQLINC=/usr/include/mysql MYSQLLIBS=${OURSTUFF}/lib64/libmariadbclient.a ${OURSTUFF}/lib64/libssl.a ${OURSTUFF}/lib64/libcrypto.a ${ZLIB} ifeq (${HOSTNAME},hgwdev) MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/11/libstdc++.a /usr/lib64/librt.a @@ -381,31 +382,31 @@ endif endif endif #global external libraries L += $(kentSrc)/htslib/libhts.a L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} 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 -lcurl +DYNAMIC_LIBS = ${DYNAMIC_PRE} -ldl -lm -lc L+= ${DYNAMIC_LIBS} # pass through COREDUMP ifneq (${COREDUMP},) HG_DEFS+=-DCOREDUMP endif # autodetect UCSC additional source code with password for some external tracks on gbib GBIBDIR = /hive/groups/browser/gbib/ ifneq ($(wildcard ${GBIBDIR}/*.c),) HG_DEFS+=-DUSE_GBIB_PWD HG_INC += -I${GBIBDIR} endif