813fe4b4d5b0b37734743735a0e43fe96d9a5674 angie Fri Aug 26 11:12:22 2022 -0700 Add -ldl to L for CONDA_BUILD; not sure why it wasn't necessary ~v417 but was ~v426. diff --git src/inc/common.mk src/inc/common.mk index 6d673df4..9d5dde2 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -132,31 +132,31 @@ # libssl: disabled by default ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) ifneq ($(wildcard ${SSL_DIR}),) L+=-L${SSL_DIR}/lib endif endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. ifeq (${IS_HGWDEV},yes) L+=/hive/groups/browser/freetype/freetype-2.10.0/objs/.libs/libfreetype.a -lbz2 L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl else ifeq (${CONDA_BUILD},1) - L+=${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a + L+=${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a -ldl else ifneq ($(wildcard /opt/local/lib/libssl.a),) L+=/opt/local/lib/libssl.a else ifneq ($(wildcard /usr/lib/x86_64-linux-gnu/libssl.a),) L+=/usr/lib/x86_64-linux-gnu/libssl.a else ifneq ($(wildcard /usr/local/opt/openssl/lib/libssl.a),) L+=/usr/local/opt/openssl/lib/libssl.a else L+=-lssl endif endif endif ifneq ($(wildcard /opt/local/lib/libcrypto.a),)