diff options
| author | triaxx <triaxx@pkgsrc.org> | 2020-04-23 07:00:08 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2020-04-23 07:00:08 +0000 |
| commit | 25198e39dc7ccff0f3d96c12a1b22651cbc18d1b (patch) | |
| tree | f9601efcc39f274c6dfe7e525649ff7e0ab44553 /devel/meson | |
| parent | e71fa8194dc9aa8c01fc594890a0f994948fae3c (diff) | |
| download | pkgsrc-25198e39dc7ccff0f3d96c12a1b22651cbc18d1b.tar.gz | |
meson: disable FreeBSD specific condition
pkgsrc changes:
---------------
* Add a patch that reverts https://github.com/mesonbuild/meson/commit/aba8792.
This commit introduced a condition to match FreeBSD path norm for
pkg-config files. This condition is incompatible with the pkgsrc conventions.
* Bump revision.
Diffstat (limited to 'devel/meson')
| -rw-r--r-- | devel/meson/Makefile | 3 | ||||
| -rw-r--r-- | devel/meson/distinfo | 3 | ||||
| -rw-r--r-- | devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/devel/meson/Makefile b/devel/meson/Makefile index d8ec435cb0a..f04fef52f78 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2020/04/01 14:51:05 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2020/04/23 07:00:08 triaxx Exp $ DISTNAME= meson-0.54.0 +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 7a8058fe56f..8ac9147f9fd 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2020/04/01 14:51:05 wiz Exp $ +$NetBSD: distinfo,v 1.7 2020/04/23 07:00:08 triaxx Exp $ SHA1 (meson-0.54.0.tar.gz) = fde1464f3c5ec73ecaa7889743f35746f0a4855b RMD160 (meson-0.54.0.tar.gz) = 446e9e74451353f3e936941decf30cef32fcd66c SHA512 (meson-0.54.0.tar.gz) = e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7 Size (meson-0.54.0.tar.gz) = 1683491 bytes SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98 +SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b diff --git a/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py b/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py new file mode 100644 index 00000000000..11632c6d1ac --- /dev/null +++ b/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py @@ -0,0 +1,19 @@ +$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.1 2020/04/23 07:00:09 triaxx Exp $ + +* Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced + a condition to match FreeBSD path norm for pkg-config files. + +--- mesonbuild/modules/pkgconfig.py.orig 2020-03-23 17:22:09.000000000 +0000 ++++ mesonbuild/modules/pkgconfig.py +@@ -496,10 +496,7 @@ class PkgConfigModule(ExtensionModule): + pcfile = filebase + '.pc' + pkgroot = kwargs.get('install_dir', default_install_dir) + if pkgroot is None: +- if mesonlib.is_freebsd(): +- pkgroot = os.path.join(state.environment.coredata.get_builtin_option('prefix'), 'libdata', 'pkgconfig') +- else: +- pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') ++ pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') + if not isinstance(pkgroot, str): + raise mesonlib.MesonException('Install_dir must be a string.') + self.generate_pkgconfig_file(state, deps, subdirs, name, description, url, |