···

       
7
       
7
       
 
       
# the moment that would produce too many spurious errors (e.g. debug

     

       
8
       
8
       
 
       
# info or assertion messages that refer to $TMPDIR).

     

       
9
       
9
       
 
       


     

       
10
       
10
       
-
       
fixupOutputHooks+=('if [ -z "$noAuditTmpdir" -a -e "$prefix" ]; then auditTmpdir "$prefix"; fi')

     

       
10
       
10
       
+
       
fixupOutputHooks+=('if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi')

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
auditTmpdir() {

     

       
13
       
13
       
 
       
    local dir="$1"

     

···

       
1
       
1
       
-
       
fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; fi')

     

       
1
       
1
       
+
       
fixupOutputHooks+=('if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi')

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
compressManPages() {

     

       
4
       
4
       
 
       
    local dir="$1"

     

···

       
8
       
8
       
 
       
fixupOutputHooks+=(_moveLib64)

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
_moveLib64() {

     

       
11
       
11
       
-
       
    if [ "$dontMoveLib64" = 1 ]; then return; fi

     

       
11
       
11
       
+
       
    if [ "${dontMoveLib64-}" = 1 ]; then return; fi

     

       
12
       
12
       
 
       
    if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then return; fi

     

       
13
       
13
       
 
       
    echo "moving $prefix/lib64/* to $prefix/lib"

     

       
14
       
14
       
 
       
    mkdir -p $prefix/lib

     

···

       
5
       
5
       
 
       
fixupOutputHooks+=(_moveSbin)

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
_moveSbin() {

     

       
8
       
8
       
-
       
    if [ "$dontMoveSbin" = 1 ]; then return; fi

     

       
8
       
8
       
+
       
    if [ "${dontMoveSbin-}" = 1 ]; then return; fi

     

       
9
       
9
       
 
       
    if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then return; fi

     

       
10
       
10
       
 
       
    echo "moving $prefix/sbin/* to $prefix/bin"

     

       
11
       
11
       
 
       
    mkdir -p $prefix/bin

     

···

       
9
       
9
       
 
       
    local varName="$1"

     

       
10
       
10
       
 
       
    local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name)

     

       
11
       
11
       
 
       
    shift

     

       
12
       
12
       
-
       
    while [ $# -ge 1 ]; do

     

       
13
       
13
       
-
       
        if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi

     

       
12
       
12
       
+
       
	while (( $# )); do

     

       
13
       
13
       
+
       
        if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi

     

       
14
       
14
       
 
       
        shift

     

       
15
       
15
       
 
       
    done

     

       
16
       
16
       
 
       
    echo "Error: _assignFirst found no valid variant!"

     
···

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
# Same as _assignFirst, but only if "$1" = ""

     

       
21
       
21
       
 
       
_overrideFirst() {

     

       
22
       
22
       
-
       
    if [ -z "${!1}" ]; then

     

       
22
       
22
       
+
       
    if [ -z "${!1-}" ]; then

     

       
23
       
23
       
 
       
        _assignFirst "$@"

     

       
24
       
24
       
 
       
    fi

     

       
25
       
25
       
 
       
}

     

···

       
8
       
8
       
 
       
fixupOutputHooks+=(_pruneLibtoolFiles)

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
_pruneLibtoolFiles() {

     

       
11
       
11
       
-
       
    if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then

     

       
11
       
11
       
+
       
    if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then

     

       
12
       
12
       
 
       
       return

     

       
13
       
13
       
 
       
    fi

     

       
14
       
14
       
 
       


     

···

       
10
       
10
       
 
       
    local -ra stripCmds=(STRIP TARGET_STRIP)

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
    # Optimization

     

       
13
       
13
       
-
       
    if [[ "$STRIP" == "$TARGET_STRIP" ]]; then

     

       
13
       
13
       
+
       
    if [[ "${STRIP-}" == "${TARGET_STRIP-}" ]]; then

     

       
14
       
14
       
 
       
        dontStripTarget+=1

     

       
15
       
15
       
 
       
    fi

     

       
16
       
16
       
 
       


     
···

       
20
       
20
       
 
       
        local -n stripCmd="${stripCmds[$i]}"

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
        # `dontStrip` disables them all

     

       
23
       
23
       
-
       
        if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null

     

       
23
       
23
       
+
       
        if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null

     

       
24
       
24
       
 
       
        then continue; fi

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}