root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

sync with devtools

Browse source
This commit is contained in:
udeved 2014-12-27 22:49:23 +01:00
parent 5670137154
commit 4ccf5e29ea
5 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/checkpkg.in
View file

@ -66,8 +66,8 @@ for _pkgname in "${pkgname[@]}"; do
sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname"
find-libprovides "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/libraries-$_pkgname-old" find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old"
find-libprovides "$pkgfile" | sort > "$TEMPDIR/libraries-$_pkgname" find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname"
if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then
msg "Sonames differ in $_pkgname!" msg "Sonames differ in $_pkgname!"
echo "$diff_output" echo "$diff_output"

12
bin/find-libdeps.in
View file

@ -44,19 +44,19 @@ else
setup_workdir setup_workdir
case ${script_mode} in case ${script_mode} in
deps) bsdtar -C $WORKDIR -xf "$1";; deps) bsdtar -C "$WORKDIR" -xf "$1";;
provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";; provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";;
esac esac
pushd $WORKDIR >/dev/null pushd "$WORKDIR" >/dev/null
fi fi
case $script_mode in case $script_mode in
deps) find_args="-perm -u+x";; deps) find_args=(-perm -u+x);;
provides) find_args="-name *.so*";; provides) find_args=(-name *.so*);;
esac esac
find $PWD -type f $find_args | while read filename; do find $PWD -type f "${find_args[@]}" | while read filename; do
if [[ $script_mode = "provides" ]]; then if [[ $script_mode = "provides" ]]; then
# ignore if we don't have a shared object # 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 if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then

8
conf/makepkg-i686.conf
View file

@ -19,6 +19,14 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
# /usr/bin/lftpget -c # /usr/bin/lftpget -c
# /usr/bin/wget # /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 # ARCHITECTURE, COMPILE FLAGS
######################################################################### #########################################################################

7
conf/makepkg-x86_64.conf
View file

@ -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/lftpget -c
# /usr/bin/wget # /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 # ARCHITECTURE, COMPILE FLAGS
######################################################################### #########################################################################

2
lib/util.sh
View file

@ -35,7 +35,7 @@ process_sofile() {
if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then if ! in_array "${soname}=${soversion}-$2" ${soobjects[@]}; then
# libfoo.so=1-64 # libfoo.so=1-64
msg "${soname}=${soversion}-$2" msg "${soname}=${soversion}-$2"
soobjects=(${soobjects[@]} "${soname}=${soversion}-$2") soobjects+=("${soname}=${soversion}-$2")
fi fi
} }