[pkgsrc/trunk]: pkgsrc Update patch for install_name on Darwin

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3605566bbd2f
branches:  trunk
changeset: 328227:3605566bbd2f
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jan 17 21:29:39 2019 +0000

description:
Update patch for install_name on Darwin

diffstat:

 databases/tdb/distinfo                                           |   4 +-
 devel/talloc/distinfo                                            |   4 +-
 devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py |  11 ++++-----
 devel/tevent/distinfo                                            |   4 +-
 devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py |  11 ++++-----
 5 files changed, 16 insertions(+), 18 deletions(-)

diffs (89 lines):

diff -r ac94811b6c02 -r 3605566bbd2f databases/tdb/distinfo
--- a/databases/tdb/distinfo    Thu Jan 17 18:42:15 2019 +0000
+++ b/databases/tdb/distinfo    Thu Jan 17 21:29:39 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2019/01/15 21:04:02 adam Exp $
+$NetBSD: distinfo,v 1.15 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (tdb-1.3.17.tar.gz) = 4cff48170f2ad3bfc85364f6f245d0b785260dba
 RMD160 (tdb-1.3.17.tar.gz) = e1a39c84812e5f95bfdce8ae8cdf90c81f383c88
 SHA512 (tdb-1.3.17.tar.gz) = ef25dad520a12d75e541802a46e418fe61ac691126600f24158cd5b95091b4c536ffc4d4aff6608cca087291fde0b86b44ff7b1a7837d816cd534e9688c39eff
 Size (tdb-1.3.17.tar.gz) = 697224 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
diff -r ac94811b6c02 -r 3605566bbd2f devel/talloc/distinfo
--- a/devel/talloc/distinfo     Thu Jan 17 18:42:15 2019 +0000
+++ b/devel/talloc/distinfo     Thu Jan 17 21:29:39 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2019/01/15 21:03:10 adam Exp $
+$NetBSD: distinfo,v 1.21 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (talloc-2.1.15.tar.gz) = 17c74ab8612f17ae1ed65751da1335a5a2d93704
 RMD160 (talloc-2.1.15.tar.gz) = 805fea7f529c8fb1f0488b54c28e6d4b50c7c182
 SHA512 (talloc-2.1.15.tar.gz) = 41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
 Size (talloc-2.1.15.tar.gz) = 634092 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
diff -r ac94811b6c02 -r 3605566bbd2f devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
--- a/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py  Thu Jan 17 18:42:15 2019 +0000
+++ b/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py  Thu Jan 17 21:29:39 2019 +0000
@@ -1,16 +1,15 @@
-$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2018/12/22 08:55:30 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.2 2019/01/17 21:29:39 adam Exp $
 
 Apply correct install_name on Darwin.
 
---- buildtools/wafsamba/samba_install.py.orig  2018-07-12 08:23:36.000000000 +0000
+--- buildtools/wafsamba/samba_install.py.orig  2019-01-14 22:24:44.000000000 +0000
 +++ buildtools/wafsamba/samba_install.py
-@@ -150,6 +150,9 @@ def install_library(self):
+@@ -151,6 +151,8 @@ def install_library(self):
              bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
          if dev_link:
              bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
-+        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
-+            self.env.append_value('LINKFLAGS', '-install_name')
-+            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and self.env.MACOSX_DEPLOYMENT_TARGET:
++            self.env.append_value('LINKFLAGS', ['-install_name', os.path.join(install_path, install_name)])
      finally:
          bld.all_envs['default'] = default_env
  
diff -r ac94811b6c02 -r 3605566bbd2f devel/tevent/distinfo
--- a/devel/tevent/distinfo     Thu Jan 17 18:42:15 2019 +0000
+++ b/devel/tevent/distinfo     Thu Jan 17 21:29:39 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/01/15 21:03:37 adam Exp $
+$NetBSD: distinfo,v 1.3 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (tevent-0.9.38.tar.gz) = 89d3948532121ac656485dd81953581647dc6a56
 RMD160 (tevent-0.9.38.tar.gz) = a0f2d418461ae08c9ebf80e56eaa7aecd8a438b9
 SHA512 (tevent-0.9.38.tar.gz) = f475a7b7c261368bd641992c8f657c081bbbe783535ff435a7b68f7749d0e5873d57d05cf6ce80a28ccc9f11033022d28e9ae357b03854109c2c279a003d2035
 Size (tevent-0.9.38.tar.gz) = 794856 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
diff -r ac94811b6c02 -r 3605566bbd2f devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py
--- a/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py  Thu Jan 17 18:42:15 2019 +0000
+++ b/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py  Thu Jan 17 21:29:39 2019 +0000
@@ -1,16 +1,15 @@
-$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2019/01/03 19:30:47 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.2 2019/01/17 21:29:39 adam Exp $
 
 Apply correct install_name on Darwin.
 
---- buildtools/wafsamba/samba_install.py.orig  2018-07-12 08:23:36.000000000 +0000
+--- buildtools/wafsamba/samba_install.py.orig  2019-01-14 22:24:44.000000000 +0000
 +++ buildtools/wafsamba/samba_install.py
-@@ -150,6 +150,9 @@ def install_library(self):
+@@ -151,6 +151,8 @@ def install_library(self):
              bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
          if dev_link:
              bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
-+        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
-+            self.env.append_value('LINKFLAGS', '-install_name')
-+            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and self.env.MACOSX_DEPLOYMENT_TARGET:
++            self.env.append_value('LINKFLAGS', ['-install_name', os.path.join(install_path, install_name)])
      finally:
          bld.all_envs['default'] = default_env