author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
Sat, 30 May 2015 14:41:57 -0700 | |
changeset 4433 | d35242d8330c |
parent 4371 | 29fdb14099eb |
permissions | -rw-r--r-- |
4371
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
1 |
Source: Home brewed |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
Fixes: using of /usr/lib in default rpath. |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
--- a/buildtools/wafadmin/Tools/libtool.py 2013-06-13 09:21:02.000000000 +0000 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ samba-4.1.12/buildtools/wafadmin/Tools/libtool.py 2014-10-22 15:39:17.080027332 +0000 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -141,7 +141,7 @@ |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
self.dlopen = None |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
self.dlpreopen = None |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
# Directory that this library needs to be installed in: |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
- self.libdir = '/usr/lib' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
+ self.libdir = '' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
if not self.__parse(): |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
raise ValueError("file %s not found!!" %(la_filename)) |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
--- a/buildtools/wafadmin/3rdparty/boost.py 2013-06-13 09:21:02.000000000 +0000 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
+++ samba-4.1.12/buildtools/wafadmin/3rdparty/boost.py 2014-10-22 15:38:11.368315144 +0000 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -41,7 +41,7 @@ |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
int main() { std::cout << BOOST_VERSION << std::endl; } |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
19 |
''' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
20 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
-boost_libpath = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib'] |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
22 |
+boost_libpath = ['/usr/local/lib', '/opt/local/lib', '/sw/lib'] |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
23 |
boost_cpppath = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include'] |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
24 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
25 |
STATIC_NOSTATIC = 'nostatic' |