From 973197909887ccd38eb5b5aaf48235dea09fdc81 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 5 Nov 2015 00:39:25 +0100 Subject: [PATCH] build:wafsamba: Moved samba_before_apply_obj_vars to samba_utils The function samba_before_apply_obj_vars serves to remove system paths, it is certainly not an optimisation and has no place in that module. By optimisation, we mean that the build process could run without it. Signed-off-by: Thomas Nagy Reviewed-by: Uri Simchoni uri@samba.org Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_optimisation.py | 22 +------------------- buildtools/wafsamba/samba_utils.py | 25 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py index 9d4fad1ed16..5008f833238 100644 --- a/buildtools/wafsamba/samba_optimisation.py +++ b/buildtools/wafsamba/samba_optimisation.py @@ -266,24 +266,4 @@ def apply_lib_vars(self): if val: self.env.append_value(v, val) -@feature('cprogram', 'cshlib', 'cstaticlib') -@after('apply_lib_vars') -@before('apply_obj_vars') -def samba_before_apply_obj_vars(self): - """before apply_obj_vars for uselib, this removes the standard pathes""" - - def is_standard_libpath(env, path): - for _path in env.STANDARD_LIBPATH: - if _path == os.path.normpath(path): - return True - return False - - v = self.env - - for i in v['RPATH']: - if is_standard_libpath(v, i): - v['RPATH'].remove(i) - - for i in v['LIBPATH']: - if is_standard_libpath(v, i): - v['LIBPATH'].remove(i) + diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index fb1355c768e..5776be89717 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -3,7 +3,7 @@ import os, sys, re, fnmatch, shlex import Build, Options, Utils, Task, Logs, Configure -from TaskGen import feature, before +from TaskGen import feature, before, after from Configure import conf, ConfigurationContext from Logs import debug @@ -683,3 +683,26 @@ def AD_DC_BUILD_IS_ENABLED(self): return False Build.BuildContext.AD_DC_BUILD_IS_ENABLED = AD_DC_BUILD_IS_ENABLED + +@feature('cprogram', 'cshlib', 'cstaticlib') +@after('apply_lib_vars') +@before('apply_obj_vars') +def samba_before_apply_obj_vars(self): + """before apply_obj_vars for uselib, this removes the standard paths""" + + def is_standard_libpath(env, path): + for _path in env.STANDARD_LIBPATH: + if _path == os.path.normpath(path): + return True + return False + + v = self.env + + for i in v['RPATH']: + if is_standard_libpath(v, i): + v['RPATH'].remove(i) + + for i in v['LIBPATH']: + if is_standard_libpath(v, i): + v['LIBPATH'].remove(i) + -- 2.34.1