mklove: add --no-static option to avoid static linking for certain libs

Author: edenhill

configure.self

@@ -96,8 +96,7 @@ void foo (void) {
     mkl_meta_set "zlib" "deb" "zlib1g-dev"
     mkl_meta_set "zlib" "rpm" "zlib-devel"
     mkl_meta_set "zlib" "apk" "zlib-dev"
-    mkl_meta_set "zlib" "static" "libz.a"
-    mkl_lib_check "zlib" "WITH_ZLIB" disable CC "-lz" \
+    mkl_lib_check --no-static "zlib" "WITH_ZLIB" disable CC "-lz" \
                   "#include <zlib.h>"
     mkl_check "libssl" disable
     mkl_check "libsasl2" disable

mklove/modules/configure.base

@@ -1510,6 +1510,7 @@ function mkl_lib_check_static {
 #
 # Arguments:
 #  [--override-action=<action>]  (internal use, overrides action argument)
+#  [--no-static]  (do not attempt to link the library statically)
 #  [--libname=<lib>] (library name if different from config name, such as
 #                     when the libname includes a dash)
 #  config name (library name (for pkg-config))
@@ -1521,19 +1522,27 @@ function mkl_lib_check_static {
 function mkl_lib_check0 {
 
     local override_action=
-    if [[ $1 == --override-action=* ]]; then
-        override_action=${1#*=}
-        shift
-    fi
-
-    local staticopt=$(mkl_meta_get $1 "static" "")
-
+    local nostaticopt=
     local libnameopt=
-    local libname=$1
-    if [[ $1 == --libname* ]]; then
-        libnameopt=$1
-        libname="${libnameopt#*=}"
+    local libname=
+
+    while [[ $1 == --* ]]; do
+        if [[ $1 == --override-action=* ]]; then
+            override_action=${1#*=}
+        elif [[ $1 == --no-static ]]; then
+            nostaticopt=$1
+        elif [[ $1 == --libname* ]]; then
+            libnameopt=$1
+            libname="${libnameopt#*=}"
+        else
+            mkl_err "mkl_lib_check: invalid option $1"
+            exit 1
+        fi
         shift
+    done
+
+    if [[ -z $libname ]]; then
+        libname=$1
     fi
 
     local action=$3
@@ -1546,13 +1555,16 @@ function mkl_lib_check0 {
     if [[ $WITH_PKGCONFIG == "y" ]]; then
         # Let pkg-config populate CFLAGS, et.al.
         # Return on success.
-        mkl_pkg_config_check $libnameopt "$1" "$2" cont "$4" "$6" && return $?
+        mkl_pkg_config_check $nostaticopt $libnameopt "$1" "$2" cont "$4" "$6" && return $?
     fi
 
     local libs="$5"
-    local stlibs=$(mkl_lib_check_static $1 "$libs")
-    if [[ -n $stlibs ]]; then
-        libs=$stlibs
+
+    if [[ -z $nostaticopt ]]; then
+        local stlibs=$(mkl_lib_check_static $1 "$libs")
+        if [[ -n $stlibs ]]; then
+            libs=$stlibs
+        fi
     fi
 
     if ! mkl_compile_check "$1" "$2" "$action" "$4" "$libs" "$6"; then
@@ -1606,7 +1618,7 @@ function mkl_lib_check {
     # being used is in-fact from the dependency builder (if supported),
     # rather than a system installed alternative, so skip the pre-check and
     # go directly to dependency installation/build below.
-    if [[ $MKL_SOURCE_DEPS_ONLY != y ]] || ! mkl_dep_has_builder $1 ; then
+    if [[ $MKL_SOURCE_DEPS_ONLY != y ]] || ! mkl_dep_has_builder $name ; then
         mkl_lib_check0 --override-action=cont "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8"
         retcode=$?
         if [[ $retcode -eq 0 ]]; then
@@ -1632,6 +1644,7 @@ function mkl_lib_check {
 # Check for library with pkg-config
 # Automatically sets CFLAGS and LIBS from pkg-config information.
 # Arguments:
+#  [--no-static]  (do not attempt to link the library statically)
 #  [--libname=<lib>] (library name if different from config name, such as
 #                     when the libname includes a dash)
 #  config name
@@ -1641,6 +1654,12 @@ function mkl_lib_check {
 #  source snippet
 function mkl_pkg_config_check {
 
+    local nostaticopt=
+    if [[ $1 == --no-static ]]; then
+        nostaticopt=$1
+        shift
+    fi
+
     local libname=$1
     if [[ $1 == --libname* ]]; then
         libname="${libnameopt#*=}"
@@ -1697,9 +1716,11 @@ $cflags"
 
     mkl_mkvar_append $1 "CFLAGS" "$cflags"
 
-    local stlibs=$(mkl_lib_check_static $1 "$libs")
-    if [[ -n $stlibs ]]; then
-        libs=$stlibs
+    if [[ -z $nostaticopt ]]; then
+        local stlibs=$(mkl_lib_check_static $1 "$libs")
+        if [[ -n $stlibs ]]; then
+            libs=$stlibs
+        fi
     fi
 
     mkl_dbg "$1: from pkg-config: LIBS: prepend $libs"