previous darwin fix was incomplete
This commit is contained in:
parent
f802011c3c
commit
14de6a2f83
2 changed files with 6 additions and 5 deletions
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.9 2015/10/23 00:48:34 tnn Exp $
|
||||
$NetBSD: distinfo,v 1.10 2015/10/23 19:52:41 tnn Exp $
|
||||
|
||||
SHA1 (tdb-1.3.4.tar.gz) = 585d188267e4ba698c86b86703cc8cd97f1a71ac
|
||||
RMD160 (tdb-1.3.4.tar.gz) = 47aabcdef10f9a22adb3a38d197548a6326cf6cc
|
||||
Size (tdb-1.3.4.tar.gz) = 483140 bytes
|
||||
SHA1 (patch-buildtools_wafadmin_Tools_ccroot.py) = fb5cec0d1c25103cb927ec9e64926042fc95167f
|
||||
SHA1 (patch-buildtools_wafadmin_Tools_ccroot.py) = ff22497c99c782c82f468efb4a388ca18fa21c2e
|
||||
|
|
|
@ -1,13 +1,14 @@
|
|||
$NetBSD: patch-buildtools_wafadmin_Tools_ccroot.py,v 1.1 2015/10/23 00:48:34 tnn Exp $
|
||||
$NetBSD: patch-buildtools_wafadmin_Tools_ccroot.py,v 1.2 2015/10/23 19:52:41 tnn Exp $
|
||||
|
||||
--- buildtools/wafadmin/Tools/ccroot.py.orig 2014-09-16 18:04:31.000000000 +0000
|
||||
+++ buildtools/wafadmin/Tools/ccroot.py
|
||||
@@ -583,6 +583,8 @@ def apply_vnum(self):
|
||||
@@ -583,6 +583,9 @@ def apply_vnum(self):
|
||||
if libname.endswith('.dylib'):
|
||||
name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum)
|
||||
name2 = libname.replace('.dylib', '.%s.dylib' % nums[0])
|
||||
+ iname = name2.replace(".inst", "")
|
||||
+ self.env.append_value('LINKFLAGS', '-install_name')
|
||||
+ self.env.append_value('LINKFLAGS', self.env.PREFIX + '/lib/' + name2)
|
||||
+ self.env.append_value('LINKFLAGS', self.env.PREFIX + '/lib/' + iname)
|
||||
else:
|
||||
name3 = libname + '.' + self.vnum
|
||||
name2 = libname + '.' + nums[0]
|
||||
|
|
Loading…
Reference in a new issue