diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-06 11:33:49 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-06 11:33:49 +0200 |
| commit | 8dbbcd6bb6614a3bff32860e24f66fd5fc5dd936 (patch) | |
| tree | d06fa95b12c7eed86be42ab9836af1fc2b2ecefb | |
| parent | 449b5ce12225d001c87fdb02b62d6882b5e9be8f (diff) | |
Fix shadow build
| -rwxr-xr-x | qt5/configure | 2 | ||||
| -rw-r--r-- | qt5/fix-webkit | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/qt5/configure b/qt5/configure index 78835fe..b805ca3 100755 --- a/qt5/configure +++ b/qt5/configure @@ -44,7 +44,7 @@ $relpath =~ s,\\,/,g; # the current directory is the "build tree" or "object tree" my $outpath = getcwd(); -system_v("perl fix-webkit") and die("Applying webkit patches failed"); +system_v("perl $relpath/fix-webkit") and die("Applying webkit patches failed"); ensureDir("$outpath/qtbase"); chdir("$outpath/qtbase"); diff --git a/qt5/fix-webkit b/qt5/fix-webkit index 3e6fb47..813b203 100644 --- a/qt5/fix-webkit +++ b/qt5/fix-webkit @@ -1,6 +1,10 @@ #!/usr/bin/perl use Cwd; +use Cwd 'abs_path'; +use File::Basename; +use File::Path; + # Find SHA1 of commit before $subject, else empty string sub findWebKitSHA1 @@ -17,8 +21,9 @@ sub findWebKitSHA1 return ""; } -my $current = getcwd(); -chdir("qtwebkit"); +my $current = dirname(abs_path($0)); +$current =~ s,\\,/,g; +chdir("$current/qtwebkit"); if (!findWebKitSHA1("Removed modular references after support for the flag was removed")) { if (system("git am --ignore-whitespace $current/patches/qtwebkit/*.patch")) { |