From 94f01075a34cfe42f41e777fc4d5e07977097b74 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 26 Mar 2010 23:17:23 +0100
Subject: scripts/populate: fix handling the forced libraries list-file

If a list-file is used, then each library in the file will be handled
twice (not a real issue, as the second iteration will find the library
already present, just avoid doing the job twice).
(transplanted from 7fec5db8933cb296c665b8526f27a779aa0c0c7a)

diff --git a/scripts/populate.in b/scripts/populate.in
index 5dbe313..7133752 100644
--- a/scripts/populate.in
+++ b/scripts/populate.in
@@ -168,6 +168,7 @@ do_add_lib() {
 pushd "${CT_ROOT_DST_DIR}" >/dev/null
 
 # First of, copy the forced libraries into the working copy
+lib_list=
 if [ -n "${CT_LIB_FILE}" ]; then
     lib_list=$("${sed}" -r -e ':loop; s/#.*//;'         \
                            -e 's/[[:space:]]+//g;'      \
@@ -175,9 +176,6 @@ if [ -n "${CT_LIB_FILE}" ]; then
                            -e '/$/N; s/\n//; tloop;'    \
                         "${CT_LIB_FILE}"
               )
-    CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}"             \
-                  |"${sed}" -r -e 's/:+/:/g; s/^:+//; s/:+$//;' \
-                 )
 fi
 CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}"             \
               |"${sed}" -r -e 's/^:+//; s/:+$//; s/:+/ /g;' \
-- 
cgit v0.10.2-6-g49f6