components/samba/samba/patches/usr-lib.patch
changeset 4433 d35242d8330c
parent 4371 29fdb14099eb
equal deleted inserted replaced
4432:3413062823ea 4433:d35242d8330c
       
     1 Source: Home brewed
       
     2 Fixes: using of /usr/lib in default rpath.
       
     3 
       
     4 --- a/buildtools/wafadmin/Tools/libtool.py	2013-06-13 09:21:02.000000000 +0000
       
     5 +++ samba-4.1.12/buildtools/wafadmin/Tools/libtool.py	2014-10-22 15:39:17.080027332 +0000
       
     6 @@ -141,7 +141,7 @@
       
     7  		self.dlopen = None
       
     8  		self.dlpreopen = None
       
     9  		# Directory that this library needs to be installed in:
       
    10 -		self.libdir = '/usr/lib'
       
    11 +		self.libdir = ''
       
    12  		if not self.__parse():
       
    13  			raise ValueError("file %s not found!!" %(la_filename))
       
    14  
       
    15 --- a/buildtools/wafadmin/3rdparty/boost.py	2013-06-13 09:21:02.000000000 +0000
       
    16 +++ samba-4.1.12/buildtools/wafadmin/3rdparty/boost.py	2014-10-22 15:38:11.368315144 +0000
       
    17 @@ -41,7 +41,7 @@
       
    18  int main() { std::cout << BOOST_VERSION << std::endl; }
       
    19  '''
       
    20  
       
    21 -boost_libpath = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
       
    22 +boost_libpath = ['/usr/local/lib', '/opt/local/lib', '/sw/lib']
       
    23  boost_cpppath = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
       
    24  
       
    25  STATIC_NOSTATIC = 'nostatic'