From dc817a2061699cd1f33ca93f0d93a1fbc2f33ea1 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Thu, 17 Jun 2010 14:32:08 +1000 Subject: makepkg: fallback to sane defaults for library stripping If the library stripping variables are not defined in makepkg.conf, libraries will be fully stripped and become broken. Fallback to a sane default stripping level. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d9867016..e64b5646 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -864,6 +864,9 @@ tidy_install() { if [[ $(check_option strip) = y && -n ${STRIP_DIRS[*]} ]]; then msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")" + # make sure library stripping variables are defined to prevent excess stripping + [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S" + [[ -z ${STRIP_STATIC+x} ]] && STRIP_STATIC="-S" local binary find ${STRIP_DIRS[@]} -type f -perm -u+w 2>/dev/null | while read binary ; do case "$(file -bi "$binary")" in -- cgit v1.2.3-54-g00ecf From c2cf6a14cf44400d0ef249b38d37eb04d3424bf4 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 20 Jun 2010 23:26:47 +1000 Subject: makepkg: revert bash4-ism Commit 3d67d9b1 introduced multiple bash4 string manipulations. Revert those in order retain compatibility with bash-3.2 which is still widely used. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e64b5646..4f9f89b1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -265,11 +265,11 @@ check_buildenv() { # ? - not found ## in_opt_array() { - local needle="${1,,}"; shift + local needle=$(tr '[:upper:]' '[:lower:]' <<< $1); shift local opt for opt in "$@"; do - opt="${opt,,}" + opt=$(tr '[:upper:]' '[:lower:]' <<< $opt) if [[ $opt = $needle ]]; then echo 'y' # Enabled return @@ -554,7 +554,7 @@ generate_checksums() { local integ for integ in ${integlist[@]}; do - integ="${integ,,}" + integ=$(tr '[:upper:]' '[:lower:]' <<< "$integ") case "$integ" in md5|sha1|sha256|sha384|sha512) : ;; *) @@ -617,7 +617,7 @@ check_checksums() { fi if (( $found )) ; then - local expectedsum="${integrity_sums[$idx],,}" + local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}") local realsum="$(openssl dgst -${integ} "$file")" realsum="${realsum##* }" if [[ $expectedsum = $realsum ]]; then @@ -1669,7 +1669,7 @@ if (( CLEANCACHE )); then echo -n "$(gettext " Are you sure you wish to do this? ")" echo -n "$(gettext "[y/N]")" read answer - answer="${answer^^}" + answer=$(tr '[:lower:]' '[:upper:]' <<< "$answer") if [[ $answer = $(gettext YES) || $answer = $(gettext Y) ]]; then rm "$SRCDEST"/* if (( $? )); then -- cgit v1.2.3-54-g00ecf