[haiku-commits] haiku: hrev46122 - build/jam

  • From: revol@xxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 29 Sep 2013 03:02:31 +0200 (CEST)

hrev46122 adds 1 changeset to branch 'master'
old head: 56214e2b3049a2fb2f3f949bf360c4218514fabf
new head: 4d65f429d0b486504be7ae31033e5ad215e3f809
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=4d65f42+%5E56214e2

----------------------------------------------------------------------------

4d65f42: Fix bashisms
  
  Besides, at least one test was probably incorrect,
  trying to match /* with a single = in [[.

                                          [ Fran├žois Revol <revol@xxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46122
Commit:      4d65f429d0b486504be7ae31033e5ad215e3f809
URL:         http://cgit.haiku-os.org/haiku/commit/?id=4d65f42
Author:      Fran├žois Revol <revol@xxxxxxx>
Date:        Sun Sep 29 01:01:39 2013 UTC

----------------------------------------------------------------------------

1 file changed, 5 insertions(+), 5 deletions(-)
build/jam/RepositoryRules | 10 +++++-----

----------------------------------------------------------------------------

diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 066ace4..23e56df 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -279,7 +279,7 @@ actions BootstrapRepositoryFetchPackage1
 
        # make Haiku cross devel package path absolute
        haikuCrossDevelPackage="$(2[1])"
-       if [[ "$haikuCrossDevelPackage" != /* ]]; then
+       if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then
                haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage"
        fi
 
@@ -287,7 +287,7 @@ actions BootstrapRepositoryFetchPackage1
        secondaryCrossDevelPackages=
        if [ -n "$(2[2-]:J)" ]; then
                for secondaryCrossDevelPackage in "$(2[2-])" ; do
-                       if [[ "$secondaryCrossDevelPackage" != /* ]]; then
+                       if [ "x$secondaryCrossDevelPackage" = 
"x${secondaryCrossDevelPackage#/}" ]; then
                                
secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage"
                        fi
                        if [ -n "$secondaryCrossDevelPackages" ]; then
@@ -340,7 +340,7 @@ EOF
 
        # If we have cross tools, add the cross tools directory.
        gcc=$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH))
-       if [[ "$gcc" = /* ]]; then
+       if [ "x$gcc" != "x${gcc#/}" ]; then
                if [ `basename $gcc` = \
                                
$(HAIKU_GCC_MACHINE_$(HAIKU_PACKAGING_ARCH))-gcc ]; then
                        dir=`dirname $gcc`
@@ -560,7 +560,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
 
        # make Haiku cross devel package path absolute
        haikuCrossDevelPackage="$(2[2])"
-       if [[ "$haikuCrossDevelPackage" != /* ]]; then
+       if [ "x$haikuCrossDevelPackage" = "x${haikuCrossDevelPackage#/}" ]; then
                haikuCrossDevelPackage="`pwd`/$haikuCrossDevelPackage"
        fi
 
@@ -568,7 +568,7 @@ actions BuildHaikuPortsSourcePackageDirectory1
        secondaryCrossDevelPackages=
        if [ -n "$(2[3-]:J)" ]; then
                for secondaryCrossDevelPackage in "$(2[3-])" ; do
-                       if [[ "$secondaryCrossDevelPackage" != /* ]]; then
+                       if [ "x$secondaryCrossDevelPackage" = 
"x${secondaryCrossDevelPackage#/}" ]; then
                                
secondaryCrossDevelPackage="`pwd`/$secondaryCrossDevelPackage"
                        fi
                        if [ -n "$secondaryCrossDevelPackages" ]; then


Other related posts:

  • » [haiku-commits] haiku: hrev46122 - build/jam - revol