up to 1.9.11

[packages/waf.git] / waf-path.patch

diff --git a/waf-path.patch b/waf-path.patch
index e05ade1668a410f6457d31572326058ca016ab60..e1217987fcfc28d6d31e33147aeed79b9f190196 100644 (file)
--- a/waf-path.patch
+++ b/waf-path.patch
@@ -1,30 +1,36 @@
-diff -burNp waf-1.5.3/waf-light waf-1.5.3-dud/waf-light
---- waf-1.5.3/waf-light        2009-01-30 20:47:11.000000000 +0100
-+++ waf-1.5.3-dud/waf-light    2009-02-11 12:32:27.151272688 +0100
+--- waf-1.6.4/waf-light.orig   2011-04-17 12:02:50.000000000 +0200
++++ waf-1.6.4/waf-light        2011-05-01 06:55:29.260143094 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
- # encoding: utf-8
- # Thomas Nagy, 2005-2009
+ # encoding: ISO8859-1
+ # Thomas Nagy, 2005-2010
  
-@@ -102,7 +102,7 @@ def find_lib():
+@@ -34,7 +34,7 @@
+ REVISION="x"
+ GIT="x"
+-INSTALL="x"
++INSTALL="/usr/share"
+ C1='x'
+ C2='x'
+ C3='x'
+ cwd = os.getcwd()
+@@ -140,7 +140,7 @@ def find_lib():
                if w: return w
-               err("waf-light requires wafadmin -> export WAFDIR=/folder")
+               err('waf-light requires waflib -> export WAFDIR=/folder')
  
--      dir = "/lib/waf-%s-%s/" % (VERSION, REVISION)
-+      dir = "/lib/waf/" 
-       for i in [INSTALL,'/usr','/usr/local','/opt']:
-               w = test(i+dir)
+-      dirname = '%s-%s-%s' % (WAF, VERSION, REVISION)
+-      for i in (INSTALL,'/usr','/usr/local','/opt'):
+-              w = test(i + '/lib/' + dirname)
++      dirname = WAF
++      for i in (INSTALL,'/usr/lib','/usr/local/lib','/opt'):
++              w = test(i + '/' + dirname)
                if w: return w
-diff -burNp waf-1.5.3/wscript waf-1.5.3-dud/wscript
---- waf-1.5.3/wscript  2009-01-30 20:45:24.000000000 +0100
-+++ waf-1.5.3-dud/wscript      2009-02-11 12:31:25.097529677 +0100
-@@ -326,7 +326,7 @@ def build(bld):
-               if val != True and val != "y": sys.exit(1)
-               create_waf()
- 
--      dir = os.path.join('lib', 'waf-%s-%s' % (VERSION, REVISION), 'wafadmin')
-+      dir = os.path.join('lib', 'waf', 'wafadmin')
+--- waf-1.6.4/wscript.orig     2011-04-17 12:02:50.000000000 +0200
++++ waf-1.6.4/wscript  2011-05-01 07:00:51.030153869 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python
+ # encoding: utf-8
+ # Thomas Nagy, 2005-2010
  
-       wafadmin = bld.new_task_gen('py')
-       wafadmin.find_sources_in_dirs('wafadmin', exts=['.py'])