860f671b8332c9be7d88450c7f5ad7ac5c25dd21 hiram Wed Nov 30 16:10:14 2022 -0800 and yet another brew upgrade addition for the Mac OSX no redmine diff --git src/inc/common.mk src/inc/common.mk index 34cecc8..acca7f8 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -262,42 +262,46 @@ ifneq ($(wildcard /usr/include/mysql/mysql.h),) MYSQLINC=/usr/include/mysql endif endif ifeq (${MYSQLINC},) ifneq ($(wildcard /opt/local/include/mysql57/mysql/mysql.h),) MYSQLINC=/opt/local/include/mysql57/mysql endif endif ifeq (${MYSQLINC},) ifneq ($(wildcard /opt/local/include/mysql55/mysql/mysql.h),) MYSQLINC=/opt/local/include/mysql55/mysql endif endif ifeq (${MYSQLLIBS},) + ifneq ($(wildcard /usr/local/Cellar/mariadb/10.9.4/lib/libmariadbclient.a),) + MYSQLLIBS+=/usr/local/Cellar/mariadb/10.9.4/lib/libmariadbclient.a + else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.8.3_1/lib/libmariadbclient.a),) MYSQLLIBS+=/usr/local/Cellar/mariadb/10.8.3_1/lib/libmariadbclient.a else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.6.4/lib/libmariadbclient.a),) MYSQLLIBS+=/usr/local/Cellar/mariadb/10.6.4/lib/libmariadbclient.a else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a),) MYSQLLIBS+=/usr/local/Cellar/mariadb/10.4.12/lib/libmariadbclient.a endif endif endif endif + endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /opt/local/lib/mysql57/mysql/libmysqlclient.a),) MYSQLLIBS=/opt/local/lib/mysql57/mysql/libmysqlclient.a endif endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /opt/local/lib/mysql55/mysql/libmysqlclient.a),) MYSQLLIBS=/opt/local/lib/mysql55/mysql/libmysqlclient.a endif endif ifeq (${MYSQLLIBS},) ifneq ($(wildcard /usr/lib64/mysql/libmysqlclient.a),) MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.a endif endif @@ -369,41 +373,45 @@ ifeq (${ZLIB},) ZLIB=-lz ifneq ($(wildcard /opt/local/lib/libz.a),) ZLIB=/opt/local/lib/libz.a endif ifneq ($(wildcard /usr/lib64/libz.a),) ZLIB=/usr/lib64/libz.a endif endif #global external libraries L += $(kentSrc)/htslib/libhts.a L+=${PNGLIB} ${MLIB} ${ZLIB} ${ICONVLIB} +ifneq ($(wildcard /usr/local/Cellar/mariadb/10.9.4/include/mysql/mysql.h),) + HG_INC+=-I/usr/local/Cellar/mariadb/10.9.4/include/mysql +else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.8.3_1/include/mysql/mysql.h),) HG_INC+=-I/usr/local/Cellar/mariadb/10.8.3_1/include/mysql else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.6.4/include/mysql/mysql.h),) HG_INC+=-I/usr/local/Cellar/mariadb/10.6.4/include/mysql else ifneq ($(wildcard /usr/local/Cellar/mariadb/10.4.12/include/mysql/mysql.h),) HG_INC+=-I/usr/local/Cellar/mariadb/10.4.12/include/mysql endif endif endif +endif ifneq ($(wildcard /opt/homebrew/Cellar/openssl@3/3.0.7/include/openssl/hmac.h),) HG_INC+=-I/opt/homebrew/Cellar/openssl@3/3.0.7/include else ifneq ($(wildcard /usr/local/opt/openssl/include/openssl/hmac.h),) HG_INC+=-I/usr/local/opt/openssl/include endif endif HG_INC+=${PNGINCL} # pass through COREDUMP ifneq (${COREDUMP},) HG_DEFS+=-DCOREDUMP endif # autodetect UCSC additional source code with password for some external tracks on gbib