[pkgsrc/trunk]: pkgsrc/devel/py-meson py-meson: Handle our multiple llvm-conf...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af6ff1553d43
branches:  trunk
changeset: 400122:af6ff1553d43
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 22 17:45:51 2019 +0000

description:
py-meson: Handle our multiple llvm-config executables in different paths.

Helps building new graphics/MesaLib when you have lang/llvm installed.

diffstat:

 devel/py-meson/Makefile                                     |   4 +-
 devel/py-meson/build.mk                                     |   7 +-
 devel/py-meson/distinfo                                     |   3 +-
 devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py |  46 +++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diffs (98 lines):

diff -r 92549f6b1c00 -r af6ff1553d43 devel/py-meson/Makefile
--- a/devel/py-meson/Makefile   Thu Aug 22 17:25:19 2019 +0000
+++ b/devel/py-meson/Makefile   Thu Aug 22 17:45:51 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2019/07/15 15:11:43 prlw1 Exp $
+# $NetBSD: Makefile,v 1.27 2019/08/22 17:45:51 nia Exp $
 
 DISTNAME=      meson-0.51.1
-PKGREVISION=   1
+PKGREVISION=   2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
diff -r 92549f6b1c00 -r af6ff1553d43 devel/py-meson/build.mk
--- a/devel/py-meson/build.mk   Thu Aug 22 17:25:19 2019 +0000
+++ b/devel/py-meson/build.mk   Thu Aug 22 17:45:51 2019 +0000
@@ -1,9 +1,14 @@
-# $NetBSD: build.mk,v 1.10 2019/07/10 10:40:35 markd Exp $
+# $NetBSD: build.mk,v 1.11 2019/08/22 17:45:51 nia Exp $
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 
 .PHONY: meson-configure meson-build meson-install
 
+# pkgsrc contains multiple llvm-config executables at multiple locations.
+.if !empty(LLVM_CONFIG_PATH)
+MAKE_ENV+=     LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
+.endif
+
 do-configure: meson-configure
 meson-configure:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --sysconfdir ${PKG_SYSCONFDIR} --buildtype=plain ${MESON_ARGS} . output
diff -r 92549f6b1c00 -r af6ff1553d43 devel/py-meson/distinfo
--- a/devel/py-meson/distinfo   Thu Aug 22 17:25:19 2019 +0000
+++ b/devel/py-meson/distinfo   Thu Aug 22 17:45:51 2019 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.23 2019/07/15 15:11:43 prlw1 Exp $
+$NetBSD: distinfo,v 1.24 2019/08/22 17:45:51 nia Exp $
 
 SHA1 (meson-0.51.1.tar.gz) = 157c6924fdade6827a6cb7cdf9ab978e0ae249fa
 RMD160 (meson-0.51.1.tar.gz) = 3a07dff3ee59890cdbb05773e5ebcd776ee775db
 SHA512 (meson-0.51.1.tar.gz) = 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 Size (meson-0.51.1.tar.gz) = 1451234 bytes
 SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd
+SHA1 (patch-mesonbuild_dependencies_dev.py) = d91d7f78cb49900baf93915bfb1ef40819945b5e
 SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a
 SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b
diff -r 92549f6b1c00 -r af6ff1553d43 devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py       Thu Aug 22 17:45:51 2019 +0000
@@ -0,0 +1,46 @@
+$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.1 2019/08/22 17:45:51 nia Exp $
+
+Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH.
+
+--- mesonbuild/dependencies/dev.py.orig        2019-07-09 16:34:42.000000000 +0000
++++ mesonbuild/dependencies/dev.py
+@@ -212,21 +212,24 @@ class LLVMDependencyConfigTool(ConfigToo
+         # newest back to oldest (3.5 is arbitrary), and finally the devel version.
+         # Please note that llvm-config-6.0 is a development snapshot and it should
+         # not be moved to the beginning of the list.
+-        self.tools = [
+-            'llvm-config', # base
+-            'llvm-config-8',   'llvm-config80',
+-            'llvm-config-7',   'llvm-config70',
+-            'llvm-config-6.0', 'llvm-config60',
+-            'llvm-config-5.0', 'llvm-config50',
+-            'llvm-config-4.0', 'llvm-config40',
+-            'llvm-config-3.9', 'llvm-config39',
+-            'llvm-config-3.8', 'llvm-config38',
+-            'llvm-config-3.7', 'llvm-config37',
+-            'llvm-config-3.6', 'llvm-config36',
+-            'llvm-config-3.5', 'llvm-config35',
+-            'llvm-config-9',     # Debian development snapshot
+-            'llvm-config-devel', # FreeBSD development snapshot
+-        ]
++        if os.environ['LLVM_CONFIG_PATH']:
++            self.tools = [ os.environ['LLVM_CONFIG_PATH'] ]
++        else:
++            self.tools = [
++                'llvm-config', # base
++                'llvm-config-8',   'llvm-config80',
++                'llvm-config-7',   'llvm-config70',
++                'llvm-config-6.0', 'llvm-config60',
++                'llvm-config-5.0', 'llvm-config50',
++                'llvm-config-4.0', 'llvm-config40',
++                'llvm-config-3.9', 'llvm-config39',
++                'llvm-config-3.8', 'llvm-config38',
++                'llvm-config-3.7', 'llvm-config37',
++                'llvm-config-3.6', 'llvm-config36',
++                'llvm-config-3.5', 'llvm-config35',
++                'llvm-config-9',     # Debian development snapshot
++                'llvm-config-devel', # FreeBSD development snapshot
++            ]
+ 
+         # Fedora starting with Fedora 30 adds a suffix of the number
+         # of bits in the isa that llvm targets, for example, on x86_64