As we discussed in the last meeting, we reset the ports tree and began from scratch, even though this change involves porting all the packages. Starting small and growing gradually, this approach will reduce build times and consequently lower energy consumption in a world affected by climate change. We will add new ports as users needs arise; ok h3artbl33d@
This commit is contained in:
parent
83a0aaf92c
commit
9a3af55370
59377 changed files with 98673 additions and 4712155 deletions
|
@ -3,8 +3,9 @@ COMMENT= next-generation build system
|
|||
MODPY_EGG_VERSION= ${GH_TAGNAME}
|
||||
GH_ACCOUNT= mesonbuild
|
||||
GH_PROJECT= meson
|
||||
GH_TAGNAME= 1.2.2
|
||||
GH_TAGNAME= 1.4.0
|
||||
EPOCH= 0
|
||||
REVISION= 1
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (meson-1.2.2.tar.gz) = HKoO9gguMRvcqYNueQf1SLjD8EGkLtQfD/kWuDrH3d0=
|
||||
SIZE (meson-1.2.2.tar.gz) = 4702607
|
||||
SHA256 (meson-1.4.0.tar.gz) = YTgvKVN4vdzZvrs6mpBlscvGcfpBuAlkqwJyb5pfOog=
|
||||
SIZE (meson-1.4.0.tar.gz) = 4757657
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# finding foo.cmake and junking it if cmake is found & used)
|
||||
DPB_PROPERTIES += noconfigurejunk
|
||||
|
||||
BUILD_DEPENDS += devel/meson>=1.2.2v0
|
||||
BUILD_DEPENDS += devel/meson>=1.4.0v0
|
||||
SEPARATE_BUILD ?= Yes
|
||||
|
||||
.if empty(CONFIGURE_STYLE)
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
Index: mesonbuild/build.py
|
||||
--- mesonbuild/build.py.orig
|
||||
+++ mesonbuild/build.py
|
||||
@@ -35,7 +35,7 @@ from .mesonlib import (
|
||||
@@ -23,7 +23,7 @@ from .mesonlib import (
|
||||
File, MesonException, MachineChoice, PerMachine, OrderedSet, listify,
|
||||
extract_as_list, typeslistify, stringlistify, classify_unity_sources,
|
||||
get_filenames_templates_dict, substitute_values, has_path_sep,
|
||||
- OptionKey, PerMachineDefaultable, OptionOverrideProxy,
|
||||
+ OptionKey, PerMachineDefaultable, OptionOverrideProxy, is_openbsd,
|
||||
- OptionKey, PerMachineDefaultable,
|
||||
+ OptionKey, PerMachineDefaultable, is_openbsd,
|
||||
MesonBugException, EnvironmentVariables, pickle_load,
|
||||
)
|
||||
from .compilers import (
|
||||
@@ -2396,6 +2396,26 @@ class SharedLibrary(BuildTarget):
|
||||
elif self.soversion:
|
||||
@@ -2359,6 +2359,26 @@ class SharedLibrary(BuildTarget):
|
||||
if self.darwin_versions is None and self.soversion is not None:
|
||||
# If unspecified, pick the soversion
|
||||
self.darwin_versions = 2 * [self.soversion]
|
||||
self.darwin_versions = (self.soversion, self.soversion)
|
||||
+ if is_openbsd():
|
||||
+ self.libversion = os.getenv('LIB' + self.name + '_VERSION')
|
||||
+ if (self.libversion is None and
|
||||
|
@ -36,8 +36,8 @@ Index: mesonbuild/build.py
|
|||
+ f.close
|
||||
|
||||
# Visual Studio module-definitions file
|
||||
if 'vs_module_defs' in kwargs:
|
||||
@@ -2467,6 +2487,8 @@ class SharedLibrary(BuildTarget):
|
||||
self.process_vs_module_defs_kw(kwargs)
|
||||
@@ -2413,6 +2433,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
|
||||
|
|
13
devel/meson/patches/patch-mesonbuild_dependencies_boost_py
Normal file
13
devel/meson/patches/patch-mesonbuild_dependencies_boost_py
Normal file
|
@ -0,0 +1,13 @@
|
|||
Index: mesonbuild/dependencies/boost.py
|
||||
--- mesonbuild/dependencies/boost.py.orig
|
||||
+++ mesonbuild/dependencies/boost.py
|
||||
@@ -594,7 +594,8 @@ class BoostDependency(SystemDependency):
|
||||
# mlog.debug(' - vscrt: {}'.format(vscrt))
|
||||
libs = [x for x in libs if x.static == self.static or not self.explicit_static]
|
||||
libs = [x for x in libs if x.mt == self.multithreading]
|
||||
- libs = [x for x in libs if x.version_matches(lib_vers)]
|
||||
+ if not mesonlib.is_openbsd():
|
||||
+ libs = [x for x in libs if x.version_matches(lib_vers)]
|
||||
libs = [x for x in libs if x.arch_matches(self.arch)]
|
||||
libs = [x for x in libs if x.vscrt_matches(vscrt)]
|
||||
libs = [x for x in libs if x.nvsuffix != 'dll'] # Only link to import libraries
|
|
@ -1,4 +1,6 @@
|
|||
bin/meson
|
||||
lib/python${MODPY_VERSION}/
|
||||
lib/python${MODPY_VERSION}/site-packages/
|
||||
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}.dist-info/
|
||||
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}.dist-info/COPYING
|
||||
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}.dist-info/METADATA
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue