Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=01620713201eab843165847ec0ff93e48f25ce1a

commit 01620713201eab843165847ec0ff93e48f25ce1a
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Mar 16 17:24:01 2014 +0100

makepkg: Make strip_pkg calls part of create_pkg, more logical and avoid to 
iterate over the subpkgs list 2 times.

diff --git a/scripts/makepkg b/scripts/makepkg
index 8cc11f0..b3b6bfc 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -914,6 +914,9 @@ _create_pkginfo()

create_pkg()
{
+       # strip binaries
+       strip_pkg "$1"
+
msg "Generating files for $1:"
# write the .PKGINFO file
msg2 ".PKGINFO file... " >&2
@@ -2081,19 +2084,6 @@ fi

cd $startdir

-# strip binaries
-strip_pkg $pkgname
-if [ -n "$subpkgs" ]; then
-       i=0
-       for subpkg in "${subpkgs[@]}"
-       do
-               unset options
-               options="${suboptions[$i]}"
-               strip_pkg $subpkg
-               i=$(($i+1))
-       done
-fi
-
# get some package meta info
builddate=`LC_ALL= ; LANG= ; date -u "+%a %b %e %H:%M:%S %Y"`
if [ "$INCHROOT" != "1" ]; then
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to