components/samba/patches/usr-lib.patch
author Jiri Sasek <Jiri.Sasek@Oracle.COM>
Tue, 22 Dec 2015 04:53:40 -0800
changeset 5222 8298df727253
parent 4371 components/samba/samba/patches/usr-lib.patch@29fdb14099eb
permissions -rw-r--r--
22456590 Component path components/samba/samba now can be reduced to components/samba .

Source: Home brewed
Fixes: using of /usr/lib in default rpath.

--- a/buildtools/wafadmin/Tools/libtool.py	2013-06-13 09:21:02.000000000 +0000
+++ samba-4.1.12/buildtools/wafadmin/Tools/libtool.py	2014-10-22 15:39:17.080027332 +0000
@@ -141,7 +141,7 @@
 		self.dlopen = None
 		self.dlpreopen = None
 		# Directory that this library needs to be installed in:
-		self.libdir = '/usr/lib'
+		self.libdir = ''
 		if not self.__parse():
 			raise ValueError("file %s not found!!" %(la_filename))
 
--- a/buildtools/wafadmin/3rdparty/boost.py	2013-06-13 09:21:02.000000000 +0000
+++ samba-4.1.12/buildtools/wafadmin/3rdparty/boost.py	2014-10-22 15:38:11.368315144 +0000
@@ -41,7 +41,7 @@
 int main() { std::cout << BOOST_VERSION << std::endl; }
 '''
 
-boost_libpath = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
+boost_libpath = ['/usr/local/lib', '/opt/local/lib', '/sw/lib']
 boost_cpppath = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
 
 STATIC_NOSTATIC = 'nostatic'