author | Shawn Walker-Salas <shawn.walker@oracle.com> |
Wed, 30 Mar 2016 13:33:31 -0700 | |
changeset 5682 | 94c0ca64c022 |
parent 5222 | 8298df727253 |
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: https://bugzilla.samba.org/show_bug.cgi?id=10112 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
2 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
3 |
From ce4d161af8431fdb1f46a3d749d34afe968c1cee Mon Sep 17 00:00:00 2001 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
4 |
From: Ralph Boehme <[email protected]> |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
5 |
Date: Fri, 23 Aug 2013 19:43:21 +0200 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
6 |
Subject: [PATCH] Use -R linker flag instead of -rpath on Solaris |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
7 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
8 |
--- |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
9 |
buildtools/wafadmin/Tools/gcc.py | 5 +++++ |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
10 |
buildtools/wafadmin/Tools/suncc.py | 1 + |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
11 |
2 files changed, 6 insertions(+) |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
12 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
13 |
diff --git a/buildtools/wafadmin/Tools/gcc.py b/buildtools/wafadmin/Tools/gcc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
14 |
index 420b44f..c3b6b1b 100644 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
15 |
--- a/buildtools/wafadmin/Tools/gcc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
16 |
+++ b/buildtools/wafadmin/Tools/gcc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
17 |
@@ -114,6 +114,11 @@ def gcc_modifier_aix(conf): |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
18 |
v['SHLIB_MARKER'] = '' |
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 |
@conftest |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
21 |
+def gcc_modifier_sunos(conf): |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
22 |
+ v = conf.env |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
23 |
+ v['RPATH_ST']='-Wl,-R%s' |
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 |
+@conftest |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
26 |
def gcc_modifier_platform(conf): |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
27 |
# * set configurations specific for a platform. |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
28 |
# * the destination platform is detected automatically by looking at the macros the compiler predefines, |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
29 |
diff --git a/buildtools/wafadmin/Tools/suncc.py b/buildtools/wafadmin/Tools/suncc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
30 |
index b1a2aad..45d4e69 100644 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
31 |
--- a/buildtools/wafadmin/Tools/suncc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
32 |
+++ b/buildtools/wafadmin/Tools/suncc.py |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
33 |
@@ -48,6 +48,7 @@ def scc_common_flags(conf): |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
34 |
v['STATICLIB_ST'] = '-l%s' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
35 |
v['STATICLIBPATH_ST'] = '-L%s' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
36 |
v['CCDEFINES_ST'] = '-D%s' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
37 |
+ v['RPATH_ST'] = '-R%s' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
38 |
|
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
39 |
v['SONAME_ST'] = '-Wl,-h -Wl,%s' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
40 |
v['SHLIB_MARKER'] = '-Bdynamic' |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
41 |
-- |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
42 |
1.8.3.4 |
29fdb14099eb
PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff
changeset
|
43 |