Changeset 1146

Timestamp:

May 12, 2017, 7:26:10 PM (8 years ago)

Author:

dmik

Message:

rpm: Make pkgconfig dependency generator work on OS/2 and under [d]ash.

File:

• rpm/trunk/scripts/pkgconfigdeps.sh (modified) (3 diffs)

rpm/trunk/scripts/pkgconfigdeps.sh

@@ -3 +3 @@
 # TODO fix this script to accept $2 instead of stdin
 # re-read file to stdin...
-exec 0<$2
+[ -n "$2" ] && exec 0<$2
 
-pkgconfig=/usr/bin/pkg-config
-test -x $pkgconfig || {
+case `uname -a` in
+OS/2*)
+    pkgconfig=/@unixroot/usr/bin/pkg-config.exe
+    pathsep="\;"
+    ;;
+*)
+    pkgconfig=/usr/bin/pkg-config
+    pathsep=":"
+    ;;
+esac
+
+test -x "$pkgconfig" || {
     cat > /dev/null
     exit 0
@@ -28 +38 @@
         # Query the dependencies of the package.
         DIR="`dirname ${filename}`"
-        export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
+        export PKG_CONFIG_PATH="$DIR$pathsep$DIR/../../share/pkgconfig"
         $pkgconfig --print-provides "$filename" 2> /dev/null | while read n r v ; do
             [ -n "$n" ] || continue
@@ -48 +58 @@
         [ $i -eq 1 ] && echo "$pkgconfig"
         DIR="`dirname ${filename}`"
-        export PKG_CONFIG_PATH="$DIR:$DIR/../../share/pkgconfig"
+        export PKG_CONFIG_PATH="$DIR$pathsep$DIR/../../share/pkgconfig"
         $pkgconfig --print-requires --print-requires-private "$filename" 2> /dev/null | while read n r v ; do
             [ -n "$n" ] || continue