wafsamba: Specify full vscript path so non-autogenerated files are possible, too.

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 3c24679a72e0c489c921f068f78dd2e1d757c4b4..5902d731f65cf0a3dd06589c4db812ea819e8adb 100644 (file)
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -156,7 +156,7 @@ def apply_vscript(self):
 
     if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
         self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" %
 
     if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
         self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" %

-            os.path.join(self.path.abspath(self.env), self.version_script))
+            self.version_script)

         self.version_script = None
 
 
         self.version_script = None
 
 

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index d92c90fb0ec21e890eb93850f9949db6871e9fcf..92041040c2f1653c28c7dc90c78cee52bef66704 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -219,6 +219,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                 # also make the .inst file depend on the vscript
                 instname = bld.env.shlib_PATTERN % (bundled_name + '.inst')
                 bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript))
                 # also make the .inst file depend on the vscript
                 instname = bld.env.shlib_PATTERN % (bundled_name + '.inst')
                 bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript))

+            vscript = os.path.join(bld.path.abspath(bld.env), vscript)

 
     bld.SET_BUILD_GROUP(group)
     t = bld(
 
     bld.SET_BUILD_GROUP(group)
     t = bld(

diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index f8afe96f1e9e7a90dcd29ed7f14fb7babab6fdbd..205b9c1359332803b9e18f7b500865f25b37f3d0 100644 (file)
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -236,7 +236,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
         bundled_name = libname
     version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
 
         bundled_name = libname
     version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
 

-    if bld.env.HAVE_LD_VERSION_SCRIPT:
+    if version_script:
+        version_script = heimdal_path(version_script)
+    elif bld.env.HAVE_LD_VERSION_SCRIPT:

         version_script = "%s.vscript" % libname
         namespace = version.replace("-","_").replace("+","_").upper(),
         HEIMDAL_GENERATOR(version_script,
         version_script = "%s.vscript" % libname
         namespace = version.replace("-","_").replace("+","_").upper(),
         HEIMDAL_GENERATOR(version_script,


@@ -244,6 +246,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
                           group='vscripts',
                           target=version_script)
         deps.append(version_script)
                           group='vscripts',
                           target=version_script)
         deps.append(version_script)

+        version_script = os.path.join(bld.path.abspath(bld.env), version_script)

 
     features = 'cc cshlib symlink_lib install_lib'
 
 
     features = 'cc cshlib symlink_lib install_lib'