diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-01 14:57:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-01 14:57:52 -0500 |
| commit | 5f4e575914fd597d31e5b9edd203eb6a8aa1306a (patch) | |
| tree | df0a69e028562bf61e05d4a7b94de7379758ef57 | |
| parent | 34ac2931234b898d587bffe76ba061082b6c673c (diff) | |
| parent | db135e90137c5ebb9248ae7bd5ced4e8ee6b27da (diff) | |
| download | devtools32-libretools-20150104.tar.xz | |
Merge branch 'archlinux'libretools-20150104
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | checkpkg.in | 4 | ||||
| -rw-r--r-- | find-libdeps.in | 14 | ||||
| -rw-r--r-- | makepkg-i686.conf | 7 | ||||
| -rw-r--r-- | makepkg-x86_64.conf | 7 |
5 files changed, 24 insertions, 10 deletions
@@ -1,4 +1,4 @@ -V=20141024 +V=20141224 PREFIX = /usr/local diff --git a/checkpkg.in b/checkpkg.in index 656d010..fcbfd80 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -63,8 +63,8 @@ for _pkgname in "${pkgname[@]}"; do sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" - find-libprovides "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/libraries-$_pkgname-old" - find-libprovides "$pkgfile" | sort > "$TEMPDIR/libraries-$_pkgname" + find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old" + find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname" if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then msg "Sonames differ in $_pkgname!" echo "$diff_output" diff --git a/find-libdeps.in b/find-libdeps.in index c9b451e..b40f794 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -32,11 +32,11 @@ else setup_workdir case ${script_mode} in - deps) bsdtar -C $WORKDIR -xf "$1";; - provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";; + deps) bsdtar -C "$WORKDIR" -xf "$1";; + provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";; esac - pushd $WORKDIR >/dev/null + pushd "$WORKDIR" >/dev/null fi process_sofile() { @@ -50,16 +50,16 @@ process_sofile() { if ! in_array "${soname}=${soversion}-${soarch}" ${soobjects[@]}; then # libfoo.so=1-64 echo "${soname}=${soversion}-${soarch}" - soobjects=(${soobjects[@]} "${soname}=${soversion}-${soarch}") + soobjects+=("${soname}=${soversion}-${soarch}") fi } case $script_mode in - deps) find_args="-perm -u+x";; - provides) find_args="-name *.so*";; + deps) find_args=(-perm -u+x);; + provides) find_args=(-name '*.so*');; esac -find . -type f $find_args | while read filename; do +find . -type f "${find_args[@]}" | while read filename; do if [[ $script_mode = "provides" ]]; then # ignore if we don't have a shared object if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then diff --git a/makepkg-i686.conf b/makepkg-i686.conf index da249f6..64ddd67 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget +#-- The the package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 33dbe99..cf14784 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o % # /usr/bin/lftpget -c # /usr/bin/wget +#-- The the package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### |