Attachment 18619 Details for Bug 5278 – Make Solaris fixes more portable

[patch] Make Solaris fixes more portable

pkg-config-0.23.patch (text/plain), 3.10 KB, created by Tim Rice on 2008-09-01 14:01:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Rice

Created: 2008-09-01 14:01:30 UTC

Size: 3.10 KB

patch

obsolete

>#
>#	check/check-cflags check/check-define-variable check/check-includedir
>#	check/check-libs check/check-libs-private check/check-requires-private
>#	Use a more capable shell on USL based systems
>#
>--- pkg-config-0.23/check/check-cflags.old	2008-01-16 12:42:49.000000000 -0800
>+++ pkg-config-0.23/check/check-cflags	2008-09-01 13:49:31.861819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e
>--- pkg-config-0.23/check/check-define-variable.old	2008-01-16 12:42:49.000000000 -0800
>+++ pkg-config-0.23/check/check-define-variable	2008-09-01 13:49:36.841819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e
>--- pkg-config-0.23/check/check-includedir.old	2008-01-16 12:42:49.000000000 -0800
>+++ pkg-config-0.23/check/check-includedir	2008-09-01 13:49:41.991819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@"
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e
>--- pkg-config-0.23/check/check-libs.old	2008-01-16 12:42:49.000000000 -0800
>+++ pkg-config-0.23/check/check-libs	2008-09-01 13:49:46.281819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e
>--- pkg-config-0.23/check/check-libs-private.old	2008-01-16 12:42:49.000000000 -0800
>+++ pkg-config-0.23/check/check-libs-private	2008-09-01 13:49:51.771819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e
>--- pkg-config-0.23/check/check-requires-private.old	2008-01-16 14:45:59.000000000 -0800
>+++ pkg-config-0.23/check/check-requires-private	2008-09-01 13:49:55.981819000 -0700
>@@ -1,8 +1,10 @@
> #! /bin/sh
> 
>-# Do the Solaris Dance:
>+# Work around non-POSIX shell
> if [ ! -d ~root ]  ; then
>-    exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /usr/xpg4/bin/sh ]  &&  exec /usr/xpg4/bin/sh $0 "$@" 
>+    [ -x /u95/bin/sh ]  &&  exec /u95/bin/sh $0 "$@" 
>+    [ -x /bin/ksh ]  &&  exec /bin/ksh $0 "$@" 
> fi
> 
> set -e

Actions: View | Splinter Review

Attachments on bug 5278: 18619

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.