]> git.sesse.net Git - vlc/commitdiff
pkg-static.sh: also merge Requires.private with Requires
authorRafaël Carré <funman@videolan.org>
Sat, 6 Sep 2014 16:09:21 +0000 (18:09 +0200)
committerRafaël Carré <funman@videolan.org>
Sat, 6 Sep 2014 16:09:21 +0000 (18:09 +0200)
contrib/src/pkg-static.sh

index 25c2af754a6f648493d52fb40cf62eda5131bdb1..59cbd786b55710945c61be692e8ed92a830def67 100755 (executable)
@@ -4,26 +4,35 @@
 
 if test -z "$1" || test -n "$2"; then
        echo "Usage: $0 <file.pc>" >&2
-       echo "Merges the pkg-config Libs.private stanza into Libs stanza." >&2
+       echo "Merges the pkg-config {Requires/Libs}.private stanza into {Requires/Libs} stanzas." >&2
        exit 1
 fi
 
 exec <"$1" >"$1.tmp" || exit $?
 
-PUBLIC=""
-PRIVATE=""
+LIBS_PUBLIC=""
+LIBS_PRIVATE=""
+REQUIRES_PUBLIC=""
+REQUIRES_PRIVATE=""
 
 while read LINE; do
-       pub="${LINE#Libs:}"
-       priv="${LINE#Libs.private:}"
-       if test "$pub" != "$LINE"; then
-               PUBLIC="$pub"
-       elif test "$priv" != "$LINE"; then
-               PRIVATE="$priv"
+       lpub="${LINE#Libs:}"
+       lpriv="${LINE#Libs.private:}"
+       rpub="${LINE#Requires:}"
+       rpriv="${LINE#Requires.private:}"
+       if test "$lpub" != "$LINE"; then
+               LIBS_PUBLIC="$lpub"
+       elif test "$lpriv" != "$LINE"; then
+               LIBS_PRIVATE="$lpriv"
+       elif test "$rpub" != "$LINE"; then
+               REQUIRES_PUBLIC="$rpub"
+       elif test "$rpriv" != "$LINE"; then
+               REQUIRES_PRIVATE="$rpriv"
        else
                echo "$LINE"
        fi
 done
-echo "Libs: $PUBLIC $PRIVATE"
+echo "Libs: $LIBS_PUBLIC $LIBS_PRIVATE"
+echo "Requires: $REQUIRES_PUBLIC $REQUIRES_PRIVATE"
 
 mv -f -- "$1.tmp" "$1"