37e6df88ac99518cc699a378d3ca405af19fbb68 galt Thu Jan 9 23:34:36 2025 -0800 One final bit allows -static compile now on hgwdev-new. Sadly, it had some issues still. diff --git src/inc/common.mk src/inc/common.mk index 397d634..ed07a2d 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -267,39 +267,41 @@ MYSQLLIBS += -lstdc++ else MYSQLLIBS += -lstdc++ -lrt endif endif ifeq (${ZLIB},) ZLIB=-lz endif # on hgwdev, use the static libraries ifeq (${IS_HGWDEV},yes) HG_INC += -I/cluster/software/include HG_INC += -I/cluster/software/include/mariadb FULLWARN = yes - L+=/hive/groups/browser/freetype/freetype-2.10.0/objs/.libs/libfreetype.a -lbz2 + L+=/hive/groups/browser/freetype/freetype-2.10.0/objs/.libs/libfreetype.a L+=/cluster/software/lib64/libssl.a /cluster/software/lib64/libcrypto.a -ldl ifeq (${HOSTNAME},hgwdev-new) PNGLIB=/cluster/software/lib/libpng.a PNGINCL=-I/cluster/software/include/libpng16 + L += /lib64/libbz2.a else PNGLIB=/usr/lib64/libpng.a PNGINCL=-I/usr/include/libpng15 + L += -lbz2 endif MYSQLINC=/usr/include/mysql MYSQLLIBS=/cluster/software/lib64/libmariadbclient.a /cluster/software/lib64/libssl.a /cluster/software/lib64/libcrypto.a -ldl -lz ifeq (${HOSTNAME},hgwdev-new) 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 endif else ifeq (${CONDA_BUILD},1) L+=${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a -ldl else