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

Update to meson-0.49.0.

Browse Source
This commit is contained in:
ajacoutot 2018-12-11 08:05:15 +00:00
parent ac0501ea6e
commit 9c551d3328
7 changed files with 25 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/meson/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2018/11/10 12:00:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.38 2018/12/11 08:05:15 ajacoutot Exp $
COMMENT= next-generation build system
MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.48.2
GH_TAGNAME= 0.49.0
EPOCH= 0
CATEGORIES= devel

4
devel/meson/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (meson-0.48.2.tar.gz) = HarC/T2X8moo9vfprdzMhaUmpHHb2DZhPONBMPaa3MA=
SIZE (meson-0.48.2.tar.gz) = 1858599
SHA256 (meson-0.49.0.tar.gz) = EbyVnnFz5xTkpOhd0r2dAUmwpRyLqC1fRMxjc19gPHQ=
SIZE (meson-0.49.0.tar.gz) = 1911251

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

@ -1,6 +1,6 @@
# $OpenBSD: meson.port.mk,v 1.29 2018/11/10 12:00:35 ajacoutot Exp $
# $OpenBSD: meson.port.mk,v 1.30 2018/12/11 08:05:15 ajacoutot Exp $
BUILD_DEPENDS += devel/meson>=0.48.2v0
BUILD_DEPENDS += devel/meson>=0.49.0v0
SEPARATE_BUILD ?= Yes
MODMESON_WANTCOLOR ?= No

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

@ -1,16 +0,0 @@
$OpenBSD: patch-mesonbuild_backend_backends_py,v 1.3 2018/11/10 12:00:35 ajacoutot Exp $
Do not install compressed manpages.
Index: mesonbuild/backend/backends.py
--- mesonbuild/backend/backends.py.orig
+++ mesonbuild/backend/backends.py
@@ -1136,7 +1136,7 @@ class Backend:
if subdir is None:
subdir = os.path.join(manroot, 'man' + num)
srcabs = f.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir())
- dstabs = os.path.join(subdir, os.path.basename(f.fname) + '.gz')
+ dstabs = os.path.join(subdir, os.path.basename(f.fname))
i = [srcabs, dstabs, m.get_custom_install_mode()]
d.man.append(i)

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

@ -1,18 +1,18 @@
$OpenBSD: patch-mesonbuild_build_py,v 1.12 2018/09/25 06:51:44 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_build_py,v 1.13 2018/12/11 08:05:15 ajacoutot Exp $
Index: mesonbuild/build.py
--- mesonbuild/build.py.orig
+++ mesonbuild/build.py
@@ -23,7 +23,7 @@ from . import dependencies
from . import mlog
from .mesonlib import File, MesonException, listify, extract_as_list, OrderedSet
from .mesonlib import typeslistify, stringlistify, classify_unity_sources
-from .mesonlib import get_filenames_templates_dict, substitute_values
+from .mesonlib import get_filenames_templates_dict, substitute_values, is_openbsd
from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep
from .compilers import is_object, clink_langs, sort_clink, lang_suffixes
from .interpreterbase import FeatureNew
@@ -1605,6 +1605,21 @@ class SharedLibrary(BuildTarget):
@@ -25,7 +25,7 @@ from . import mlog
from .mesonlib import (
File, MesonException, listify, extract_as_list, OrderedSet,
typeslistify, stringlistify, classify_unity_sources,
- get_filenames_templates_dict, substitute_values,
+ get_filenames_templates_dict, substitute_values, is_openbsd,
for_windows, for_darwin, for_cygwin, for_android, has_path_sep
)
from .compilers import is_object, clink_langs, sort_clink, lang_suffixes, get_macos_dylib_install_name
@@ -1719,6 +1719,21 @@ class SharedLibrary(BuildTarget):
elif self.soversion:
# If unspecified, pick the soversion
self.darwin_versions = 2 * [self.soversion]
@ -34,7 +34,7 @@ Index: mesonbuild/build.py
# Visual Studio module-definitions file
if 'vs_module_defs' in kwargs:
@@ -1670,6 +1685,8 @@ class SharedLibrary(BuildTarget):
@@ -1784,6 +1799,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

35
devel/meson/patches/patch-mesonbuild_minstall_py
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-mesonbuild_minstall_py,v 1.2 2018/08/27 07:37:09 ajacoutot Exp $
Do not install compressed manpages.
Index: mesonbuild/minstall.py
--- mesonbuild/minstall.py.orig
+++ mesonbuild/minstall.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys, pickle, os, shutil, subprocess, gzip, errno
+import sys, pickle, os, shutil, subprocess, errno
import shlex
import argparse
from glob import glob
@@ -382,17 +382,7 @@ class Installer:
outdir = os.path.dirname(outfilename)
d.dirmaker.makedirs(outdir, exist_ok=True)
install_mode = m[2]
- if outfilename.endswith('.gz') and not full_source_filename.endswith('.gz'):
- with open(outfilename, 'wb') as of:
- with open(full_source_filename, 'rb') as sf:
- # Set mtime and filename for reproducibility.
- with gzip.GzipFile(fileobj=of, mode='wb', filename='', mtime=0) as gz:
- gz.write(sf.read())
- shutil.copystat(full_source_filename, outfilename)
- print('Installing %s to %s' % (full_source_filename, outdir))
- append_to_log(self.lf, outfilename)
- else:
- self.do_copyfile(full_source_filename, outfilename)
+ self.do_copyfile(full_source_filename, outfilename)
set_mode(outfilename, install_mode, d.install_umask)
def install_headers(self, d):

8
devel/meson/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2018/09/25 06:51:44 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.14 2018/12/11 08:05:16 ajacoutot Exp $
bin/meson
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -25,6 +25,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minstall.${M
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mintro.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mlog.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mparser.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}msetup.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}msubprojects.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mtest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}optinterpreter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}rewriter.${MODPY_PYC_MAGIC_TAG}pyc
@ -89,6 +91,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/base.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/boost.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/CMakeLists.txt
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/dev.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/misc.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/platform.py
@ -139,6 +143,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/unstable_icestorm.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/unstable_simd.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/windows.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mparser.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/msetup.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/msubprojects.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mtest.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/optinterpreter.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/rewriter.py