cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Write an shared_libs.log file like libtool(1) does.

Browse Source
This commit is contained in:
ajacoutot 2017-11-11 21:07:06 +00:00
parent 2b1aad352d
commit 357f6d2406
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/meson/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2017/11/05 11:02:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.21 2017/11/11 21:07:06 ajacoutot Exp $
COMMENT= next-generation build system
@ -6,7 +6,7 @@ MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.43.0
REVISION= 4
REVISION= 5
CATEGORIES= devel

16
devel/meson/patches/patch-mesonbuild_build_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mesonbuild_build_py,v 1.3 2017/11/05 11:02:43 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_build_py,v 1.4 2017/11/11 21:07:06 ajacoutot Exp $
Index: mesonbuild/build.py
--- mesonbuild/build.py.orig
@ -12,19 +12,29 @@ Index: mesonbuild/build.py
from .mesonlib import typeslistify, stringlistify, classify_unity_sources
from .mesonlib import get_filenames_templates_dict, substitute_values
from .environment import for_windows, for_darwin, for_cygwin
@@ -1397,6 +1397,11 @@ class SharedLibrary(BuildTarget):
@@ -1397,6 +1397,21 @@ class SharedLibrary(BuildTarget):
# We replicate what Autotools does here and take the first
# number of the version by default.
self.soversion = self.ltversion.split('.')[0]
+ if is_openbsd():
+ self.libversion = os.getenv('LIB' + self.name + '_VERSION')
+ if self.libversion is not None:
+ self.ltversion_orig = self.ltversion if self.ltversion is not None else self.soversion
+ self.ltversion = self.libversion.format(self)
+ self.soversion = self.ltversion
+ shared_libs_log = os.path.join(self.environment.get_build_dir(), 'shared_libs.log')
+ if not os.path.isfile(shared_libs_log):
+ f = open(shared_libs_log, 'w+')
+ f.write("# SHARED_LIBS+= {:<25}<obsd version> # <orig version>\n".format("<libname>"))
+ f.close
+ f = open(shared_libs_log, 'a')
+ f.write("SHARED_LIBS += {:<25} {} # {}\n".format(self.name, \
+ self.soversion, self.ltversion_orig))
+ f.close
# Visual Studio module-definitions file
if 'vs_module_defs' in kwargs:
path = kwargs['vs_module_defs']
@@ -1464,6 +1469,8 @@ class SharedLibrary(BuildTarget):
@@ -1464,6 +1479,8 @@ class SharedLibrary(BuildTarget):
# filename. If ltversion != soversion we create an soversion alias:
# libfoo.so.0 -> libfoo.so.0.100.0
# Where libfoo.so.0.100.0 is the actual library