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

Revert part of previous; not quite ready yet (loadable modules renamed

Browse Source 
with versionned numbers).
This commit is contained in:
ajacoutot 2022-02-21 12:58:09 +00:00
parent 9658a18f5b
commit 4524f95e30
3 changed files with 8 additions and 8 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.106 2022/02/20 11:21:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.107 2022/02/21 12:58:09 ajacoutot Exp $
COMMENT= next-generation build system
@ -7,7 +7,7 @@ GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.61.2
EPOCH= 0
REVISION= 0
REVISION= 1
CATEGORIES= devel

4
devel/meson/meson.port.mk
View File

@ -1,6 +1,6 @@
# $OpenBSD: meson.port.mk,v 1.75 2022/02/20 11:21:06 ajacoutot Exp $
# $OpenBSD: meson.port.mk,v 1.76 2022/02/21 12:58:09 ajacoutot Exp $
BUILD_DEPENDS += devel/meson>=0.61.2v0
BUILD_DEPENDS += devel/meson>=0.61.2p1v0
SEPARATE_BUILD ?= Yes
.if empty(CONFIGURE_STYLE)

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

@ -1,4 +1,4 @@
$OpenBSD: patch-mesonbuild_build_py,v 1.31 2022/02/20 11:21:06 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_build_py,v 1.32 2022/02/21 12:58:09 ajacoutot Exp $
Index: mesonbuild/build.py
--- mesonbuild/build.py.orig
@ -18,9 +18,9 @@ Index: mesonbuild/build.py
self.darwin_versions = 2 * [self.soversion]
+ if is_openbsd():
+ self.libversion = os.getenv('LIB' + self.name + '_VERSION')
+ if (self.libversion is None and
+ str(os.getenv('MODMESON_PORT_BUILD')).casefold() == 'yes'):
+ self.libversion = '0.0'
+# if (self.libversion is None and
+# str(os.getenv('MODMESON_PORT_BUILD')).casefold() == 'yes'):
+# self.libversion = '0.0'
+ 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)