sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgconfig.req: pass --print-requires-private to pkg-config

Browse Source
This commit is contained in:
Дмитрий Левин 2010-11-01 01:51:05 +00:00
parent f501d403f0
commit 2fc9a40da8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm-4_0.spec
View File

@ -108,7 +108,7 @@ Requires: %_bindir/subst
Requires: alternatives >= 0.3.2 Requires: alternatives >= 0.3.2
Requires: elfutils >= 0.143-alt1 Requires: elfutils >= 0.143-alt1
Requires: info-install >= 4.11 Requires: info-install >= 4.11
Requires: pkgconfig-reqprov pkgconfig-recursion Requires: pkgconfig-print-requires-private pkgconfig-recursion
Requires: rpm-build-perl >= 0.6.2 Requires: rpm-build-perl >= 0.6.2
Requires: rpm-build-python >= 0.31 Requires: rpm-build-python >= 0.31
Conflicts: rpm-build-tcl <= 0.2 Conflicts: rpm-build-tcl <= 0.2

8
scripts/pkgconfig.req.in
View File

@ -1,6 +1,6 @@
#!/bin/sh -efu #!/bin/sh -efu
# #
# Copyright (C) 2006 Dmitry V. Levin <ldv@altlinux.org> # Copyright (C) 2006-2010 Dmitry V. Levin <ldv@altlinux.org>
# Copyright (C) 2007 Alexey Tourbin <at@altlinux.org> # Copyright (C) 2007 Alexey Tourbin <at@altlinux.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -30,7 +30,7 @@ reqprov=
PkgconfigReqProv() PkgconfigReqProv()
{ {
local f="$1" out=; shift local f="$1" out=; shift
out=$(pkg-config --print-errors --print-"${reqprov:?}" "$f") || out=$(pkg-config --print-errors $reqprov "$f") ||
Fatal "failed to process $f" Fatal "failed to process $f"
[ -n "$out" ] || return 0 [ -n "$out" ] || return 0
echo "$out" |while read -r line; do echo "$out" |while read -r line; do
@ -64,7 +64,7 @@ PkgconfigReqProv()
} }
case "${0##*/}" in case "${0##*/}" in
pkgconfig.req*) reqprov=requires ArgvFileAction PkgconfigReqProv "$@" ;; pkgconfig.req*) reqprov='--print-requires --print-requires-private' ArgvFileAction PkgconfigReqProv "$@" ;;
pkgconfig.prov*) reqprov=provides ArgvFileAction PkgconfigReqProv "$@" ;; pkgconfig.prov*) reqprov=--print-provides ArgvFileAction PkgconfigReqProv "$@" ;;
*) Fatal "req/prov method not recognized" ;; *) Fatal "req/prov method not recognized" ;;
esac esac