diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-03-26 22:17:23 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-03-26 22:17:23 (GMT) |
| commit | 94f01075a34cfe42f41e777fc4d5e07977097b74 (patch) | |
| tree | bd24ac6b321f97269c1ba6f97b26fd6b7fbf9e34 | |
| parent | d07a32ebade3027f55e892cec1cdbb1305e4a11c (diff) | |
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)
| -rw-r--r-- | scripts/populate.in | 4 |
1 files changed, 1 insertions, 3 deletions
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;' \ |