complibs: disable building shared libs

Managing the shared version of the companion libraries
has become cumbersome.

Also, it will one day be possible to use the companion
libraries from the host distribution, and then we will
be able to easily use either shared or static libs.

As a side note, while working on the canadian-rework
series, it has become quite more complex to properly
handle shared companion libraries, as they need to be
built both for the build and gost systems. That's not
easy to handle. At all.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

1 files changed, 2 insertions, 9 deletions

diff --git a/scripts/build/companion_libs/libelf.sh b/scripts/build/companion_libs/libelf.sh
index 1e4d36f..d53510e 100644
--- a/scripts/build/companion_libs/libelf.sh
+++ b/scripts/build/companion_libs/libelf.sh
@@ -22,20 +22,12 @@ do_libelf_extract() {
 if [ "${CT_LIBELF}" = "y" ]; then
 
 do_libelf() {
-    local -a libelf_opts
-
     CT_DoStep INFO "Installing libelf"
     mkdir -p "${CT_BUILD_DIR}/build-libelf"
     CT_Pushd "${CT_BUILD_DIR}/build-libelf"
 
     CT_DoLog EXTRA "Configuring libelf"
 
-    if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
-        libelf_opts+=( --enable-shared --disable-static )
-    else
-        libelf_opts+=( --disable-shared --enable-static )
-    fi
-
     CT_DoExecLog CFG                                        \
     CC="${CT_HOST}-gcc"                                     \
     CFLAGS="-fPIC"                                          \
@@ -47,7 +39,8 @@ do_libelf() {
         --enable-compat                                     \
         --enable-elf64                                      \
         --enable-extended-format                            \
-        "${libelf_opts[@]}"
+        --disable-shared                                    \
+        --enable-static
 
     CT_DoLog EXTRA "Building libelf"
     CT_DoExecLog ALL make