Revert "TODO: build: fix issue with standard libpaths introduced by cups-config and...

This reverts commit 85ade6d617218e7465a2ceb317570e11f1e9996b.

diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py
index e68961bf4e2f2cd3db42db950be166831455be90..264bdc7f0f6350db145fcdcba22aff27a94b306a 100644 (file)
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/buildtools/wafadmin/Tools/ccroot.py
@@ -20,12 +20,6 @@ import config_c # <- necessary for the configuration, do not touch
 
 USE_TOP_LEVEL = False
 
-def is_standard_libpath(env, path):
-       for _path in env.STANDARD_LIBPATH:
-               if _path == os.path.normpath(path):
-                       return True
-       return False
-
 def get_cc_version(conf, cc, gcc=False, icc=False):
 
        cmd = cc + ['-dM', '-E', '-']
@@ -473,14 +467,10 @@ def apply_obj_vars(self):
                v.append_value('LINKFLAGS', v['FULLSTATIC_MARKER'])
 
        for i in v['RPATH']:
-               if is_standard_libpath(v, i):
-                       continue
                if i and rpath_st:
                        app('LINKFLAGS', rpath_st % i)
 
        for i in v['LIBPATH']:
-               if is_standard_libpath(v, i):
-                       continue
                app('LINKFLAGS', libpath_st % i)
                app('LINKFLAGS', staticlibpath_st % i)
 

diff --git a/buildtools/wafadmin/Tools/config_c.py b/buildtools/wafadmin/Tools/config_c.py
index dedcfa841d24b28f81eb2cc2f7830184ce25a431..d0bc61773625576cec1d0b1eec2635086d04c2e7 100644 (file)
--- a/buildtools/wafadmin/Tools/config_c.py
+++ b/buildtools/wafadmin/Tools/config_c.py
@@ -11,7 +11,6 @@ from Utils import md5
 import Build, Utils, Configure, Task, Options, Logs, TaskGen
 from Constants import *
 from Configure import conf, conftest
-import ccroot
 
 cfg_ver = {
        'atleast-version': '>=',
@@ -61,8 +60,7 @@ def parse_flags(line, uselib, env):
                        app('LIB_' + uselib, ot)
                elif st == '-L':
                        if not ot: ot = lst.pop(0)
-                       if not ccroot.is_standard_libpath(env, ot):
-                               app('LIBPATH_' + uselib, ot)
+                       app('LIBPATH_' + uselib, ot)
                elif x == '-pthread' or x.startswith('+'):
                        app('CCFLAGS_' + uselib, x)
                        app('CXXFLAGS_' + uselib, x)
@@ -85,11 +83,9 @@ def parse_flags(line, uselib, env):
                # in too old versions of our internal libs.
                #
                elif x.startswith('-Wl,-R'):
-                       if not ccroot.is_standard_libpath(env,x[6:]):
-                               app('RPATH_' + uselib, x[6:])
+                       app('RPATH_' + uselib, x[6:])
                elif x.startswith('-Wl,-rpath,'):
-                       if not ccroot.is_standard_libpath(env, x[11:]):
-                               app('RPATH_' + uselib, x[11:])
+                       app('RPATH_' + uselib, x[11:])
                elif x.startswith('-Wl'):
                        app('LINKFLAGS_' + uselib, x)
                elif x.startswith('-m') or x.startswith('-f'):

diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index d5ee841dbed6b5d10b1df9b1cc6d4276c74ca2bf..35c61c24664ecac5522b937c33c75e3d14038660 100644 (file)
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -11,7 +11,6 @@ from Logs import debug, warn, info
 from TaskGen import extension, before, after, feature
 from Configure import conf
 from config_c import parse_flags
-import ccroot
 
 EXT_PY = ['.py']
 FRAG_2 = '''
@@ -250,8 +249,7 @@ MACOSX_DEPLOYMENT_TARGET = %r
                result = conf.check(lib=name, uselib='PYEMBED', libpath=path)
 
        if result:
-               if not ccroot.is_standard_libpath(env, path[0]):
-                       env['LIBPATH_PYEMBED'] = path
+               env['LIBPATH_PYEMBED'] = path
                env.append_value('LIB_PYEMBED', name)
        else:
                conf.log.write("\n\n### LIB NOT FOUND\n")

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index cd71be56e6ec0a1cf3e50563cbf17aedc470626b..1a30d2fa9366ab00b09182de6aa9884f245ff6e6 100755 (executable)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -192,33 +192,6 @@ def set_options(opt):
                    help='tag release in git at the same time',
                    type='string', action='store', dest='TAG_RELEASE')
 
-#
-# Determine the standard libpath for the used compiler,
-# so we can later use that to filter out these standard
-# library paths when some tools like cups-config or
-# python-config report standard lib paths with their
-# ldflags (-L...)
-#
-def get_cc_std_libpath(cc):
-    # at least gcc and clang support this:
-    try:
-        cmd = cc + ['-print-search-dirs']
-        out = Utils.cmd_output(cmd).split('\n')
-    except ValueError:
-        # option not supported by compiler - use a standard list of directories
-        dirlist = [ '/usr/lib', '/usr/lib64' ]
-    except:
-        raise Utils.WafError('Unexpected error running "%s"' % (cmd,))
-    else:
-        dirlist = []
-        for line in out:
-            line = line.strip()
-            if line.startswith("libraries: ="):
-                dirliststr = line[len("libraries: ="):]
-                dirlist = [ os.path.normpath(x) for x in dirliststr.split(':') ]
-                break
-
-    return dirlist
 
 @wafsamba.runonce
 def configure(conf):
@@ -238,8 +211,6 @@ def configure(conf):
 
     conf.check_tool('compiler_cc')
 
-    conf.env.STANDARD_LIBPATH = get_cc_std_libpath(conf.env.CC)
-
     # we need git for 'waf dist'
     conf.find_program('git', var='GIT')