9d542df73260c3684c03577730164274dc602740
max
  Mon Dec 9 09:45:12 2024 -0800
Revert "switching to dynamic linking for openssl, Hiram was right, refs #27931"

This reverts commit 87a8394cc5287fd9f117ade776bb414160f22e7f.

diff --git src/inc/common.mk src/inc/common.mk
index 089cfea..d65c943 100644
--- src/inc/common.mk
+++ src/inc/common.mk
@@ -220,35 +220,35 @@
   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+=/cluster/software/lib64/libssl.so /cluster/software/lib64/libcrypto.so -ldl
+   L+=/cluster/software/lib64/libssl.a /cluster/software/lib64/libcrypto.a -ldl
    PNGLIB=/usr/lib64/libpng.a
    PNGINCL=-I/usr/include/libpng15
    MYSQLINC=/usr/include/mysql
-   MYSQLLIBS=/cluster/software/lib64/libmariadbclient.a
+   MYSQLLIBS=/cluster/software/lib64/libmariadbclient.a /cluster/software/lib64/libssl.a /cluster/software/lib64/libcrypto.a -ldl -lz
    MYSQLLIBS += /usr/lib/gcc/x86_64-redhat-linux/4.8.5/libstdc++.a /usr/lib64/librt.a
 else
    ifeq (${CONDA_BUILD},1)
        L+=${PREFIX}/lib/libssl.a ${PREFIX}/lib/libcrypto.a -ldl
    else
        ifneq (${SSLLIB},)
           L+=${SSLLIB}
        else
           L+=-lssl
        endif
        ifneq (${CRYPTOLIB},)
           L+=${CRYPTOLIB}
        else
           L+=-lcrypto -ldl
        endif