From d45ac2f39bc58404fa5f3d5ad9ce23e0537d0e52 Mon Sep 17 00:00:00 2001
From: "Gustavo J. A. M. Carneiro" <gjc@inescporto.pt>
Date: Mon, 12 Sep 2011 16:19:24 +0100
Subject: [PATCH] waf 1.6: bring back -Wl,--soname, fix waf warnings

---
 bindings/python/wscript | 4 ++--
 src/wscript             | 7 +++----
 waf-tools/command.py    | 5 +++--
 wscript                 | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bindings/python/wscript b/bindings/python/wscript
index 9f5a47e2c..7d6563e5b 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -309,7 +309,7 @@ class apiscan_task(Task.TaskBase):
     """Uses gccxml to scan the file 'everything.h' and extract API definitions.
     """
     after = 'gen_ns3_module_header ns3header'
-    before = 'cc cxx gchx'
+    before = 'cc cxx'
     color = "BLUE"
     def __init__(self, curdirnode, env, bld, target, cflags, module):
         self.bld = bld
@@ -402,7 +402,7 @@ class python_scan_task_collector(Task.TaskBase):
 
 class gen_ns3_compat_pymod_task(Task.Task):
     """Generates a 'ns3.py' compatibility module."""
-    before = 'cc cxx gchx'
+    before = 'cc cxx'
     color = 'BLUE'
     
     def run(self):
diff --git a/src/wscript b/src/wscript
index 7b9759c4b..ba5d56e2c 100644
--- a/src/wscript
+++ b/src/wscript
@@ -195,6 +195,7 @@ def create_ns3_module(bld, name, dependencies=(), test=False):
         module = bld.new_task_gen(features=['cxx', 'cxxstlib', 'ns3module'])
     else:
         module = bld.new_task_gen(features=['cxx', 'cxxshlib', 'ns3module'])
+    module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(module.path), name)
     linkflags = []
     cxxflags = []
     ccflags = []
@@ -207,9 +208,8 @@ def create_ns3_module(bld, name, dependencies=(), test=False):
             # Get the module library name without any relative paths
             # at its beginning because all of the libraries will end
             # up in the same directory.
-            if 0: # TODO FIXME
-                module_library_name = os.path.basename(ccroot.get_target_name(module))
-                linkflags = '-Wl,--soname=%s' % module_library_name
+            module_library_name = module.env.cshlib_PATTERN % (os.path.basename(module.target),)
+            linkflags = '-Wl,--soname=' + module_library_name
     elif module.env['CXX_NAME'] in ['gcc', 'icc'] and \
             os.uname()[4] == 'x86_64' and \
             sys.platform != 'darwin' and \
@@ -231,7 +231,6 @@ def create_ns3_module(bld, name, dependencies=(), test=False):
     module.is_static = static
     module.vnum = wutils.VNUM
     # Add the proper path to the module's name.
-    module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(module.path), name)
     # Set the libraries this module depends on.  
     module.module_deps = list(dependencies)
 
diff --git a/waf-tools/command.py b/waf-tools/command.py
index 5953a6695..9066e0abb 100644
--- a/waf-tools/command.py
+++ b/waf-tools/command.py
@@ -104,8 +104,9 @@ class command_task(Task.Task):
 @TaskGen.feature('command')
 def init_command(self):
 	Utils.def_attrs(self,
-			# other variables that can be used in the command: ${VARIABLE}
-			variables = None)
+					# other variables that can be used in the command: ${VARIABLE}
+					variables = None,
+					rule='')
 
 
 
diff --git a/wscript b/wscript
index 8801483c6..557879b88 100644
--- a/wscript
+++ b/wscript
@@ -894,7 +894,7 @@ def check(bld):
     wutils.run_python_program("test.py -n -c core", env)
 
 class print_introspected_doxygen_task(Task.TaskBase):
-    after = 'cc cxx cc_link cxx_link'
+    after = 'cc cxx link'
     color = 'BLUE'
 
     def __init__(self, bld):
@@ -925,7 +925,7 @@ class print_introspected_doxygen_task(Task.TaskBase):
             out.close()
 
 class run_python_unit_tests_task(Task.TaskBase):
-    after = 'cc cxx cc_link cxx_link'
+    after = 'cc cxx link'
     color = 'BLUE'
 
     def __init__(self, bld):