1ff2e18ba5e50dd2d1becd3cd6a25343578c10b8 markd Tue Apr 21 14:09:04 2026 -0700 rework of htslib/UDC integration to use htslib hfile driver mechanism diff --git src/inc/common.mk src/inc/common.mk index f23185380c2..64208ffa249 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -334,33 +334,34 @@ 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 - + # FIXME: tmp for getting htslib going + #L+=${OURSTUFF}/lib/libcurl.a + #L+=${OURSTUFF}/lib64/libssl.a ${OURSTUFF}/lib64/libcrypto.a + L += -lcurl -llzma -lssl -lcrypto 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 else MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a /usr/lib64/librt.a