bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: use proper array addition in libdeps

Browse source 
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2012-03-11 15:33:13 -04:00 • committed by Dan McGee
parent 87c4fb51a4
commit ecd6eddf13
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/makepkg.sh.in
View file

@ -1091,7 +1091,7 @@ find_libdepends() {
if ! in_array "${soname}=${soversion}-${soarch}" ${libdepends[@]}; then if ! in_array "${soname}=${soversion}-${soarch}" ${libdepends[@]}; then
# libfoo.so=1-64 # libfoo.so=1-64
printf "%s" "${soname}=${soversion}-${soarch}" printf "%s" "${soname}=${soversion}-${soarch}"
libdepends=(${libdepends[@]} "${soname}=${soversion}-${soarch}") libdepends+=("${soname}=${soversion}-${soarch}")
fi fi
fi fi
done done
@ -1114,7 +1114,7 @@ find_libprovides() {
local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p') local sofile=$(LC_ALL=C readelf -d "$fn" 2>/dev/null | sed -n 's/.*Library soname: \[\(.*\)\].*/\1/p')
if [[ -z "$sofile" ]]; then if [[ -z "$sofile" ]]; then
warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p" warning "$(gettext "Library listed in %s is not versioned: %s")" "'provides'" "$p"
libprovides=(${libprovides[@]} "$p") libprovides+=("$p")
continue continue
fi fi
@ -1124,19 +1124,19 @@ find_libprovides() {
# extract the library major version # extract the library major version
local soversion="${sofile##*\.so\.}" local soversion="${sofile##*\.so\.}"
libprovides=(${libprovides[@]} "${p}=${soversion}-${soarch}") libprovides+=("${p}=${soversion}-${soarch}")
else else
warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p" warning "$(gettext "Library listed in %s is not a shared object: %s")" "'provides'" "$p"
libprovides=(${libprovides[@]} "$p") libprovides+=("$p")
fi fi
done done
else else
libprovides=(${libprovides[@]} "$p") libprovides+=("$p")
missing=1 missing=1
fi fi
;; ;;
*) *)
libprovides=(${libprovides[@]} "$p") libprovides+=("$p")
;; ;;
esac esac
@ -1203,7 +1203,7 @@ write_pkginfo() {
local it local it
libdepends=$(find_libdepends) libdepends=$(find_libdepends)
depends=("${depends[@]}" ${libdepends}) depends+=(${libdepends})
for it in "${depends[@]}"; do for it in "${depends[@]}"; do
if [[ $it = *.so ]]; then if [[ $it = *.so ]]; then