[PATCH 1 of 2] complibs: better deduce whether to backup complibs or not

["Yann E. MORIN" <yann dot morin dot 1998 at anciens dot enib dot fr>]

# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1286140246 -7200
# Node ID fd7c1ef7a71b68a7ff9c85810c33bd9c10349ac7
# Parent  ff2181adbd28c91a21fa5f230bf92aaa7824dc73
complibs: better deduce whether to backup complibs or not

To decide whether we need to backup the companion libraries,
do not rely on the !shared case. In the future other cases
may require not to save the companion libraries (eg. if using
the ones provided by the host distro).

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

diff --git a/config/companion_libs.in b/config/companion_libs.in
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -73,6 +73,11 @@
 
 comment "Companion libraries common options"
 
+config COMPLIBS_BACKUP
+    bool
+    default y
+    depends on ! COMPLIBS_SHARED
+
 config COMPLIBS_CHECK
     bool
     prompt "Check the companion libraries builds (!!! READ HELP!!!)"
diff --git a/scripts/functions b/scripts/functions
--- a/scripts/functions
+++ b/scripts/functions
@@ -1017,9 +1017,7 @@
                            /^(UID|EUID)=/d;
                            /^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
 
-    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
-        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
-        # so do not save.
+    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
         CT_DoTarballIfExists "${CT_COMPLIBS_DIR}" "${state_dir}/complibs_dir"
     fi
     CT_DoTarballIfExists "${CT_CONFIG_DIR}" "${state_dir}/config_dir"
@@ -1060,9 +1058,7 @@
     CT_DoExtractTarballIfExists "${state_dir}/cc_core_shared_prefix_dir" "${CT_CC_CORE_SHARED_PREFIX_DIR}"
     CT_DoExtractTarballIfExists "${state_dir}/cc_core_static_prefix_dir" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
     CT_DoExtractTarballIfExists "${state_dir}/config_dir" "${CT_CONFIG_DIR}"
-    if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
-        # If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
-        # so do not restore.
+    if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
         CT_DoExtractTarballIfExists "${state_dir}/complibs_dir" "${CT_COMPLIBS_DIR}"
     fi
 



--
For unsubscribe information see http://sourceware.org/lists.html#faq