379ce66045730c6b05a996312622b9696cfdb78b hiram Fri Nov 11 15:52:55 2022 -0800 more libraries for kent source build on Mac OSX Monterey arm64 machine no redmine diff --git src/inc/common.mk src/inc/common.mk index a64eac2..622e073 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -134,53 +134,64 @@ 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 -ldl else + ifneq ($(wildcard /opt/homebrew/Cellar/openssl@1.1/1.1.1s/lib/libssl.a),) + L+=/opt/homebrew/Cellar/openssl@1.1/1.1.1s/lib/libssl.a + 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 + endif + ifneq ($(wildcard /opt/homebrew/Cellar/openssl@1.1/1.1.1s/lib/libcrypto.a),) + L+=/opt/homebrew/Cellar/openssl@1.1/1.1.1s/lib/libcrypto.a + else ifneq ($(wildcard /opt/local/lib/libcrypto.a),) L+=/opt/local/lib/libcrypto.a else ifneq ($(wildcard /usr/local/opt/openssl/lib/libcrypto.a),) L+=/usr/local/opt/openssl/lib/libcrypto.a else L+=-lcrypto endif endif endif + ifneq ($(wildcard /opt/homebrew/Cellar/zstd/1.5.2/lib/libzstd.a),) + L+=/opt/homebrew/Cellar/zstd/1.5.2/lib/libzstd.a + endif + endif endif # autodetect where libm is installed ifeq (${MLIB},) ifneq ($(wildcard /usr/lib64/libm.a),) MLIB=-lm endif endif ifeq (${MLIB},) MLIB=-lm endif # autodetect where png is installed ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib64/libpng.a),)