SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SecBSD's official ports repository

Browse source
This commit is contained in:
purplerain 2023-08-16 22:26:55 +00:00
commit 2c0afcbbf3
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
64331 changed files with 5339189 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

34
net/samba/patches/patch-buildtools_wafsamba_samba_install_py Normal file
View file

@ -0,0 +1,34 @@
Make Samba4 WAF respect OpenBSD shared libraries versioning conventions.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9774
Index: buildtools/wafsamba/samba_install.py
--- buildtools/wafsamba/samba_install.py.orig
+++ buildtools/wafsamba/samba_install.py
@@ -114,11 +114,15 @@ def install_library(self):
else:
inst_name = bld.make_libname(t.target)
elif self.vnum:
+ import sys
vnum_base = self.vnum.split('.')[0]
install_name = bld.make_libname(target_name, version=self.vnum)
- install_link = bld.make_libname(target_name, version=vnum_base)
- inst_name = bld.make_libname(t.target)
- if not self.private_library or not t.env.SONAME_ST:
+ if sys.platform.startswith('openbsd'):
+ install_link = install_name
+ else:
+ install_link = bld.make_libname(target_name, version=vnum_base)
+ inst_name = bld.make_libname(t.target, version=self.vnum)
+ if not sys.platform.startswith("openbsd") and (not self.private_library or not t.env.SONAME_ST):
# only generate the dev link for non-bundled libs
dev_link = bld.make_libname(target_name)
elif getattr(self, 'soname', ''):
@@ -169,7 +173,7 @@ def apply_vscript(self):
'''add version-script arguments to library build'''
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
- self.env.append_value('LINKFLAGS', "-Wl,--version-script=%s" %
+ self.env.append_unique('LINKFLAGS', "-Wl,--version-script=%s" %
self.version_script)
self.version_script = None