components/samba/samba/patches/0001-Use-R-linker-flag-instead-of-rpath-on-Solaris.patch
changeset 5222 8298df727253
parent 5221 e63c8f63ac44
child 5223 66bb65945d8f
--- a/components/samba/samba/patches/0001-Use-R-linker-flag-instead-of-rpath-on-Solaris.patch	Mon Dec 21 18:48:54 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Source: https://bugzilla.samba.org/show_bug.cgi?id=10112
-
-From ce4d161af8431fdb1f46a3d749d34afe968c1cee Mon Sep 17 00:00:00 2001
-From: Ralph Boehme <[email protected]>
-Date: Fri, 23 Aug 2013 19:43:21 +0200
-Subject: [PATCH] Use -R linker flag instead of -rpath on Solaris
-
----
- buildtools/wafadmin/Tools/gcc.py   | 5 +++++
- buildtools/wafadmin/Tools/suncc.py | 1 +
- 2 files changed, 6 insertions(+)
-
-diff --git a/buildtools/wafadmin/Tools/gcc.py b/buildtools/wafadmin/Tools/gcc.py
-index 420b44f..c3b6b1b 100644
---- a/buildtools/wafadmin/Tools/gcc.py
-+++ b/buildtools/wafadmin/Tools/gcc.py
-@@ -114,6 +114,11 @@ def gcc_modifier_aix(conf):
- 	v['SHLIB_MARKER']        = ''
- 
- @conftest
-+def gcc_modifier_sunos(conf):
-+	v = conf.env
-+	v['RPATH_ST']='-Wl,-R%s'
-+
-+@conftest
- def gcc_modifier_platform(conf):
- 	# * set configurations specific for a platform.
- 	# * the destination platform is detected automatically by looking at the macros the compiler predefines,
-diff --git a/buildtools/wafadmin/Tools/suncc.py b/buildtools/wafadmin/Tools/suncc.py
-index b1a2aad..45d4e69 100644
---- a/buildtools/wafadmin/Tools/suncc.py
-+++ b/buildtools/wafadmin/Tools/suncc.py
-@@ -48,6 +48,7 @@ def scc_common_flags(conf):
- 	v['STATICLIB_ST']        = '-l%s'
- 	v['STATICLIBPATH_ST']    = '-L%s'
- 	v['CCDEFINES_ST']        = '-D%s'
-+	v['RPATH_ST']            = '-R%s'
- 
- 	v['SONAME_ST']           = '-Wl,-h -Wl,%s'
- 	v['SHLIB_MARKER']        = '-Bdynamic'
--- 
-1.8.3.4
-