[jhbuild] Adjust waf patch so it builds outside source tree. (Bug #569778)



commit 271d115678ccff4a4e3572ed5f8c6a63eb8217d9
Author: Theppitak Karoonboonyanan <thep linux thai net>
Date:   Mon May 4 21:02:34 2009 +0700

    Adjust waf patch so it builds outside source tree. (Bug #569778)
---
 patches/waf-install.patch |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/patches/waf-install.patch b/patches/waf-install.patch
index 7cd5200..f6e8f3f 100644
--- a/patches/waf-install.patch
+++ b/patches/waf-install.patch
@@ -1,7 +1,9 @@
 Fix WAF to work as an autotools module type.
 
---- waf-1.4.3/wscript	2008-05-20 15:32:51 +0000
-+++ waf-1.4.3/wscript	2008-05-20 15:33:28 +0000
+Index: waf-1.4.4/wscript
+===================================================================
+--- waf-1.4.4.orig/wscript	2009-05-04 20:49:36.000000000 +0700
++++ waf-1.4.4/wscript	2009-05-04 20:49:45.000000000 +0700
 @@ -314,9 +314,6 @@
  			sys.exit(0)
  
@@ -12,11 +14,29 @@ Fix WAF to work as an autotools module type.
  		compute_revision()
  
  		create_waf()
---- waf-1.4.3/utils/autogen.sh	2008-06-23 01:52:48 +0200
-+++ waf-1.4.3/utils/autogen.sh	2008-08-21 13:52:04 +0200
-@@ -47,3 +47,5 @@
+Index: waf-1.4.4/utils/autogen.sh
+===================================================================
+--- waf-1.4.4.orig/utils/autogen.sh	2009-05-04 20:49:36.000000000 +0700
++++ waf-1.4.4/utils/autogen.sh	2009-05-04 20:52:38.000000000 +0700
+@@ -2,7 +2,14 @@
+ 
+ # This script is an autogen.sh-like wrapper for allowing WAF to be installed by jhbuild
+ 
+-WAF=./waf-light
++srcdir=`dirname $0`
++if test -n "$srcdir"; then
++  srcdir=$srcdir/..
++else
++  srcdir=.
++fi
++
++WAF=$srcdir/waf-light
+ prefix=""
+ 
+ while test -n "$1"; do
+@@ -47,3 +54,5 @@
  
  EOF
  
-+./configure --prefix=$prefix
-+./waf configure $prefix
++$srcdir/configure --prefix=$prefix
++$srcdir/waf configure $prefix



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]