Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 18:33:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rediff patch

Browse source
This commit is contained in:
Mikhail Novosyolov 2019-04-07 17:35:05 +03:00
parent 0b729be01e
commit 5e882d4ae7
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rpm-5.4.10-Parse-private-dependencies-from-pkgconfig-files.patch
View file

@ -1,6 +1,6 @@
From f5192769e9e1fbf0e0e613c69c5158b66a6c4026 Mon Sep 17 00:00:00 2001
From d4b68e164dc86589019a6fbb51e5ef27c670f4a2 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Thu, 21 Feb 2019 20:10:40 +0300
Date: Sun, 7 Apr 2019 17:34:16 +0300
Subject: [PATCH] Parse private dependencies from pkgconfig files
- The support for --print-requires|provides was only upstreamed in
@ -19,7 +19,7 @@ from RPM4 to RPM5.
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/pkgconfigdeps.sh b/scripts/pkgconfigdeps.sh
index cd4f452..b00b6c4 100755
index 31db20d..cf59d3e 100755
--- a/scripts/pkgconfigdeps.sh
+++ b/scripts/pkgconfigdeps.sh
@@ -11,6 +11,11 @@ test -x $pkgconfig || {
@ -34,15 +34,15 @@ index cd4f452..b00b6c4 100755
case $1 in
-P|--provides)
while read filename ; do
@@ -44,7 +49,7 @@ case $1 in
DIR=`dirname ${filename}`
PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
export PKG_CONFIG_PATH
- $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
+ $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
[ -n "$n" ] || continue
if [ -n "$r" ] && [ -n "$v" ]; then
echo "pkgconfig($n) $r $v"
@@ -47,7 +52,7 @@ case $1 in
DIR=`dirname ${filename}`
PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
export PKG_CONFIG_PATH
- $pkgconfig --print-requires "$filename" 2> /dev/null | while read n r v ; do
+ $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
[ -n "$n" ] || continue
if [ -n "$r" ] && [ -n "$v" ]; then
echo "pkgconfig($n) $r $v"
--
2.19.2
2.21.0