7dbf62b3ebac4ec5f0ce9fd8c4dd8821f9c22c2c
hiram
  Sun Nov 13 18:39:41 2022 -0800
closer to a legal compile on Mac OSX Monterey for arm64 architecture no redmine

diff --git src/inc/common.mk src/inc/common.mk
index 622e073..34cecc8 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -134,49 +134,49 @@
   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
+     ifneq ($(wildcard /opt/homebrew/Cellar/openssl@3/3.0.7/lib/libssl.a),)
+         L+=/opt/homebrew/Cellar/openssl@3/3.0.7/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
+     ifneq ($(wildcard /opt/homebrew/Cellar/openssl@3/3.0.7/lib/libcrypto.a),)
+         L+=/opt/homebrew/Cellar/openssl@3/3.0.7/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
@@ -315,32 +315,32 @@
     ifneq ($(wildcard /usr/lib64/mysql/libmysqlclient.so),)
 	  MYSQLLIBS=/usr/lib64/mysql/libmysqlclient.so
     endif
   endif
   ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/lib/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/lib/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 /opt/homebrew/Cellar/mysql-client/8.0.31/lib/libmysqlclient.a),)
-        MYSQLLIBS=/opt/homebrew/Cellar/mysql-client/8.0.31/lib/libmysqlclient.a
+    ifneq ($(wildcard /opt/local/lib/mariadb-10.10/mysql/libmariadbclient.a),)
+        MYSQLLIBS=/opt/local/lib/mariadb-10.10/mysql/libmariadbclient.a
     endif
   endif
   ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/local/Cellar/mysql/5.6.19/lib/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/local/Cellar/mysql/5.6.19/lib/libmysqlclient.a
     endif
   endif
   ifeq (${MYSQLLIBS},)
     ifneq ($(wildcard /usr/local/Cellar/mysql/5.6.16/lib/libmysqlclient.a),)
 	  MYSQLLIBS=/usr/local/Cellar/mysql/5.6.16/lib/libmysqlclient.a
     endif
   endif
   ifeq ($(findstring src/hg/,${CURDIR}),src/hg/)
     ifeq (${MYSQLINC},)
         $(error can not find installed mysql development system)
@@ -369,45 +369,49 @@
 
 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}
-HG_INC+=${PNGINCL}
 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
+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
 GBIBDIR = /hive/groups/browser/gbib/
 ifneq ($(wildcard ${GBIBDIR}/*.c),)
   HG_DEFS+=-DUSE_GBIB_PWD
   HG_INC += -I${GBIBDIR}
 endif
 
 SYS = $(shell uname -s)