diff options
author | Russel Winder <russel@winder.org.uk> | 2014-09-11 19:42:56 (GMT) |
---|---|---|
committer | Russel Winder <russel@winder.org.uk> | 2014-09-11 19:42:56 (GMT) |
commit | b068a00f91abb6e5f4282cdd7d85b20497108d2b (patch) | |
tree | a125cf2fc6f5024c9919f4a992b318c1350f0304 | |
parent | 70a6365e0bcf530819a83edaa3b9d9bbc08b218e (diff) | |
parent | 87cb9ca579c9e8cc2d972552f8db6590b991cdeb (diff) | |
download | SCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.zip SCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.tar.gz SCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.tar.bz2 |
Commit merge issues.
-rw-r--r-- | doc/SConscript | 1 | ||||
-rw-r--r-- | src/engine/SCons/Tool/ldc.py | 2 | ||||
-rw-r--r-- | test/Docbook/basedir/htmlchunked/htmlchunked.py | 1 | ||||
-rw-r--r-- | test/Docbook/basedir/htmlhelp/htmlhelp.py | 1 | ||||
-rw-r--r-- | test/Docbook/basedir/slideshtml/slideshtml.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/epub/epub.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/html/html.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/htmlchunked/htmlchunked.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/htmlhelp/htmlhelp.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/man/man.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/slideshtml/slideshtml.py | 1 | ||||
-rw-r--r-- | test/Docbook/basic/xinclude/xinclude.py | 1 | ||||
-rw-r--r-- | test/Docbook/dependencies/xinclude/xinclude.py | 1 | ||||
-rw-r--r-- | test/Docbook/rootname/htmlchunked/htmlchunked.py | 1 | ||||
-rw-r--r-- | test/Docbook/rootname/htmlhelp/htmlhelp.py | 1 | ||||
-rw-r--r-- | test/Docbook/rootname/slideshtml/slideshtml.py | 1 | ||||
-rw-r--r-- | test/sconsign/script/Configure.py | 3 |
17 files changed, 17 insertions, 3 deletions
diff --git a/doc/SConscript b/doc/SConscript index b82d63b..7880ba3 100644 --- a/doc/SConscript +++ b/doc/SConscript @@ -82,6 +82,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. skip_doc = False try: import libxml2 + import libxslt except: try: import lxml diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index 6b080e6..d74464f 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -126,7 +126,7 @@ def generate(env): # platform supports it. env['DRPATHPREFIX'] = '-L-rpath=' env['DRPATHSUFFIX'] = '' - env['_RPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}' + env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}' SCons.Tool.createStaticLibBuilder(env) diff --git a/test/Docbook/basedir/htmlchunked/htmlchunked.py b/test/Docbook/basedir/htmlchunked/htmlchunked.py index cf5f3d1..f97555b 100644 --- a/test/Docbook/basedir/htmlchunked/htmlchunked.py +++ b/test/Docbook/basedir/htmlchunked/htmlchunked.py @@ -38,6 +38,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basedir/htmlhelp/htmlhelp.py b/test/Docbook/basedir/htmlhelp/htmlhelp.py index 22bbd72..17aba09 100644 --- a/test/Docbook/basedir/htmlhelp/htmlhelp.py +++ b/test/Docbook/basedir/htmlhelp/htmlhelp.py @@ -38,6 +38,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basedir/slideshtml/slideshtml.py b/test/Docbook/basedir/slideshtml/slideshtml.py index a2375e4..a89edcd 100644 --- a/test/Docbook/basedir/slideshtml/slideshtml.py +++ b/test/Docbook/basedir/slideshtml/slideshtml.py @@ -39,6 +39,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/epub/epub.py b/test/Docbook/basic/epub/epub.py index 19e08a0..0a317b6 100644 --- a/test/Docbook/basic/epub/epub.py +++ b/test/Docbook/basic/epub/epub.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/html/html.py b/test/Docbook/basic/html/html.py index 0cb4fb6..acf38a3 100644 --- a/test/Docbook/basic/html/html.py +++ b/test/Docbook/basic/html/html.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/htmlchunked/htmlchunked.py b/test/Docbook/basic/htmlchunked/htmlchunked.py index 46cc8dc..74b8c7a 100644 --- a/test/Docbook/basic/htmlchunked/htmlchunked.py +++ b/test/Docbook/basic/htmlchunked/htmlchunked.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/htmlhelp/htmlhelp.py b/test/Docbook/basic/htmlhelp/htmlhelp.py index 9b00bbd..080ec60 100644 --- a/test/Docbook/basic/htmlhelp/htmlhelp.py +++ b/test/Docbook/basic/htmlhelp/htmlhelp.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/man/man.py b/test/Docbook/basic/man/man.py index c1f164d..d9b16b3 100644 --- a/test/Docbook/basic/man/man.py +++ b/test/Docbook/basic/man/man.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/slideshtml/slideshtml.py b/test/Docbook/basic/slideshtml/slideshtml.py index 37c2be0..8251b3e 100644 --- a/test/Docbook/basic/slideshtml/slideshtml.py +++ b/test/Docbook/basic/slideshtml/slideshtml.py @@ -39,6 +39,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/basic/xinclude/xinclude.py b/test/Docbook/basic/xinclude/xinclude.py index 2d87713..302c777 100644 --- a/test/Docbook/basic/xinclude/xinclude.py +++ b/test/Docbook/basic/xinclude/xinclude.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/dependencies/xinclude/xinclude.py b/test/Docbook/dependencies/xinclude/xinclude.py index 84d9ce7..115163c 100644 --- a/test/Docbook/dependencies/xinclude/xinclude.py +++ b/test/Docbook/dependencies/xinclude/xinclude.py @@ -32,6 +32,7 @@ test = TestSCons.TestSCons() try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/rootname/htmlchunked/htmlchunked.py b/test/Docbook/rootname/htmlchunked/htmlchunked.py index 8ab91d2..65b50ef 100644 --- a/test/Docbook/rootname/htmlchunked/htmlchunked.py +++ b/test/Docbook/rootname/htmlchunked/htmlchunked.py @@ -38,6 +38,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/rootname/htmlhelp/htmlhelp.py b/test/Docbook/rootname/htmlhelp/htmlhelp.py index ee37e1a..9d0b076 100644 --- a/test/Docbook/rootname/htmlhelp/htmlhelp.py +++ b/test/Docbook/rootname/htmlhelp/htmlhelp.py @@ -38,6 +38,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/Docbook/rootname/slideshtml/slideshtml.py b/test/Docbook/rootname/slideshtml/slideshtml.py index 4d55035..399764b 100644 --- a/test/Docbook/rootname/slideshtml/slideshtml.py +++ b/test/Docbook/rootname/slideshtml/slideshtml.py @@ -39,6 +39,7 @@ if not (sys.platform.startswith('linux') and try: import libxml2 + import libxslt except: try: import lxml diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 3b43def..679f084 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -58,9 +58,8 @@ CC_file = re.escape(CC_file) _sconf_temp_conftest_0_c = '.sconf_temp/conftest_0.c' test.write('SConstruct', """ -env = Environment() import os -env.AppendENVPath('PATH', os.environ['PATH']) +env = Environment(ENV={'PATH' : os.environ.get('PATH','')}) conf = Configure(env) r1 = conf.CheckCHeader( 'math.h' ) env = conf.Finish() |