Fri Aug 23 11:07:00 2019 UTC ()
py-meson: Check for the LLVM_CONFIG_PATH key properly


(nia)
diff -r1.27 -r1.28 pkgsrc/devel/py-meson/Makefile
diff -r1.24 -r1.25 pkgsrc/devel/py-meson/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py
cvs diff -r1.27 -r1.28 pkgsrc/devel/py-meson/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/py-meson/Attic/Makefile 2019/08/22 17:45:51 1.27
+++ pkgsrc/devel/py-meson/Attic/Makefile 2019/08/23 11:07:00 1.28
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.27 2019/08/22 17:45:51 nia Exp $ 1# $NetBSD: Makefile,v 1.28 2019/08/23 11:07:00 nia Exp $
2 2
3DISTNAME= meson-0.51.1 3DISTNAME= meson-0.51.1
4PKGREVISION= 2 4PKGREVISION= 3
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= devel python 6CATEGORIES= devel python
7MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://mesonbuild.com/ 10HOMEPAGE= http://mesonbuild.com/
11COMMENT= Open source build system meant to be fast and user friendly 11COMMENT= Open source build system meant to be fast and user friendly
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
15 15
16PYTHON_VERSIONS_INCOMPATIBLE= 27 16PYTHON_VERSIONS_INCOMPATIBLE= 27
17 17
18USE_LANGUAGES= c c++ # c++ for tests 18USE_LANGUAGES= c c++ # c++ for tests
19 19
20SUBST_CLASSES+= man 20SUBST_CLASSES+= man
21SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," 21SUBST_SED.man+= -e "s,share/man,${PKGMANDIR},"
22SUBST_FILES.man+= setup.py 22SUBST_FILES.man+= setup.py
23SUBST_STAGE.man= pre-configure 23SUBST_STAGE.man= pre-configure
24SUBST_MESSAGE.man= Fixing man page installation path. 24SUBST_MESSAGE.man= Fixing man page installation path.
25 25
26REPLACE_PYTHON+= ghwt.py 26REPLACE_PYTHON+= ghwt.py
27REPLACE_PYTHON+= meson.py 27REPLACE_PYTHON+= meson.py
28REPLACE_PYTHON+= mesonbuild/rewriter.py 28REPLACE_PYTHON+= mesonbuild/rewriter.py
29REPLACE_PYTHON+= run_*.py 29REPLACE_PYTHON+= run_*.py
30REPLACE_PYTHON+= test\ cases/*/*/*.py 30REPLACE_PYTHON+= test\ cases/*/*/*.py
31REPLACE_PYTHON+= test\ cases/*/*/*/*.py 31REPLACE_PYTHON+= test\ cases/*/*/*/*.py
32REPLACE_PYTHON+= test\ cases/*/*/*/*/*.py 32REPLACE_PYTHON+= test\ cases/*/*/*/*/*.py
33REPLACE_PYTHON+= test\ cases/common/14\ configure\ file/test.py.in 33REPLACE_PYTHON+= test\ cases/common/14\ configure\ file/test.py.in
34REPLACE_PYTHON+= test\ cases/common/188\ find\ override/subdir/gencodegen.py.in 34REPLACE_PYTHON+= test\ cases/common/188\ find\ override/subdir/gencodegen.py.in
35REPLACE_PYTHON+= test\ cases/common/55\ run\ target/configure.in 35REPLACE_PYTHON+= test\ cases/common/55\ run\ target/configure.in
36REPLACE_PYTHON+= test\ cases/windows/8\ find\ program/test-script 36REPLACE_PYTHON+= test\ cases/windows/8\ find\ program/test-script
37REPLACE_PYTHON+= tools/*.py 37REPLACE_PYTHON+= tools/*.py
38 38
39do-test: 39do-test:
40 cd ${WRKSRC} && ${PYTHONBIN} run_tests.py 40 cd ${WRKSRC} && ${PYTHONBIN} run_tests.py
41 41
42.include "../../lang/python/application.mk" 42.include "../../lang/python/application.mk"
43.include "../../lang/python/egg.mk" 43.include "../../lang/python/egg.mk"
44.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/devel/py-meson/Attic/distinfo (switch to unified diff)

--- pkgsrc/devel/py-meson/Attic/distinfo 2019/08/22 17:45:51 1.24
+++ pkgsrc/devel/py-meson/Attic/distinfo 2019/08/23 11:07:00 1.25
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.24 2019/08/22 17:45:51 nia Exp $ 1$NetBSD: distinfo,v 1.25 2019/08/23 11:07:00 nia Exp $
2 2
3SHA1 (meson-0.51.1.tar.gz) = 157c6924fdade6827a6cb7cdf9ab978e0ae249fa 3SHA1 (meson-0.51.1.tar.gz) = 157c6924fdade6827a6cb7cdf9ab978e0ae249fa
4RMD160 (meson-0.51.1.tar.gz) = 3a07dff3ee59890cdbb05773e5ebcd776ee775db 4RMD160 (meson-0.51.1.tar.gz) = 3a07dff3ee59890cdbb05773e5ebcd776ee775db
5SHA512 (meson-0.51.1.tar.gz) = 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c 5SHA512 (meson-0.51.1.tar.gz) = 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
6Size (meson-0.51.1.tar.gz) = 1451234 bytes 6Size (meson-0.51.1.tar.gz) = 1451234 bytes
7SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd 7SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd
8SHA1 (patch-mesonbuild_dependencies_dev.py) = d91d7f78cb49900baf93915bfb1ef40819945b5e 8SHA1 (patch-mesonbuild_dependencies_dev.py) = 068b7e6a105eec694c469f0bf50324385900f91f
9SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a 9SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a
10SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64 10SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64
11SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b 11SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b
cvs diff -r1.1 -r1.2 pkgsrc/devel/py-meson/patches/Attic/patch-mesonbuild_dependencies_dev.py (switch to unified diff)

--- pkgsrc/devel/py-meson/patches/Attic/patch-mesonbuild_dependencies_dev.py 2019/08/22 17:45:51 1.1
+++ pkgsrc/devel/py-meson/patches/Attic/patch-mesonbuild_dependencies_dev.py 2019/08/23 11:07:00 1.2
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.1 2019/08/22 17:45:51 nia Exp $ 1$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.2 2019/08/23 11:07:00 nia Exp $
2 2
3Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH. 3Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH.
4 4
5--- mesonbuild/dependencies/dev.py.orig 2019-07-09 16:34:42.000000000 +0000 5--- mesonbuild/dependencies/dev.py.orig 2019-07-09 16:34:42.000000000 +0000
6+++ mesonbuild/dependencies/dev.py 6+++ mesonbuild/dependencies/dev.py
7@@ -212,21 +212,24 @@ class LLVMDependencyConfigTool(ConfigToo 7@@ -212,21 +212,24 @@ class LLVMDependencyConfigTool(ConfigToo
8 # newest back to oldest (3.5 is arbitrary), and finally the devel version. 8 # newest back to oldest (3.5 is arbitrary), and finally the devel version.
9 # Please note that llvm-config-6.0 is a development snapshot and it should 9 # Please note that llvm-config-6.0 is a development snapshot and it should
10 # not be moved to the beginning of the list. 10 # not be moved to the beginning of the list.
11- self.tools = [ 11- self.tools = [
12- 'llvm-config', # base 12- 'llvm-config', # base
13- 'llvm-config-8', 'llvm-config80', 13- 'llvm-config-8', 'llvm-config80',
14- 'llvm-config-7', 'llvm-config70', 14- 'llvm-config-7', 'llvm-config70',
15- 'llvm-config-6.0', 'llvm-config60', 15- 'llvm-config-6.0', 'llvm-config60',
16- 'llvm-config-5.0', 'llvm-config50', 16- 'llvm-config-5.0', 'llvm-config50',
17- 'llvm-config-4.0', 'llvm-config40', 17- 'llvm-config-4.0', 'llvm-config40',
18- 'llvm-config-3.9', 'llvm-config39', 18- 'llvm-config-3.9', 'llvm-config39',
19- 'llvm-config-3.8', 'llvm-config38', 19- 'llvm-config-3.8', 'llvm-config38',
20- 'llvm-config-3.7', 'llvm-config37', 20- 'llvm-config-3.7', 'llvm-config37',
21- 'llvm-config-3.6', 'llvm-config36', 21- 'llvm-config-3.6', 'llvm-config36',
22- 'llvm-config-3.5', 'llvm-config35', 22- 'llvm-config-3.5', 'llvm-config35',
23- 'llvm-config-9', # Debian development snapshot 23- 'llvm-config-9', # Debian development snapshot
24- 'llvm-config-devel', # FreeBSD development snapshot 24- 'llvm-config-devel', # FreeBSD development snapshot
25- ] 25- ]
26+ if os.environ['LLVM_CONFIG_PATH']: 26+ if 'LLVM_CONFIG_PATH' in os.environ:
27+ self.tools = [ os.environ['LLVM_CONFIG_PATH'] ] 27+ self.tools = [ os.environ['LLVM_CONFIG_PATH'] ]
28+ else: 28+ else:
29+ self.tools = [ 29+ self.tools = [
30+ 'llvm-config', # base 30+ 'llvm-config', # base
31+ 'llvm-config-8', 'llvm-config80', 31+ 'llvm-config-8', 'llvm-config80',
32+ 'llvm-config-7', 'llvm-config70', 32+ 'llvm-config-7', 'llvm-config70',
33+ 'llvm-config-6.0', 'llvm-config60', 33+ 'llvm-config-6.0', 'llvm-config60',
34+ 'llvm-config-5.0', 'llvm-config50', 34+ 'llvm-config-5.0', 'llvm-config50',
35+ 'llvm-config-4.0', 'llvm-config40', 35+ 'llvm-config-4.0', 'llvm-config40',
36+ 'llvm-config-3.9', 'llvm-config39', 36+ 'llvm-config-3.9', 'llvm-config39',
37+ 'llvm-config-3.8', 'llvm-config38', 37+ 'llvm-config-3.8', 'llvm-config38',
38+ 'llvm-config-3.7', 'llvm-config37', 38+ 'llvm-config-3.7', 'llvm-config37',
39+ 'llvm-config-3.6', 'llvm-config36', 39+ 'llvm-config-3.6', 'llvm-config36',
40+ 'llvm-config-3.5', 'llvm-config35', 40+ 'llvm-config-3.5', 'llvm-config35',
41+ 'llvm-config-9', # Debian development snapshot 41+ 'llvm-config-9', # Debian development snapshot
42+ 'llvm-config-devel', # FreeBSD development snapshot 42+ 'llvm-config-devel', # FreeBSD development snapshot
43+ ] 43+ ]
44  44
45 # Fedora starting with Fedora 30 adds a suffix of the number 45 # Fedora starting with Fedora 30 adds a suffix of the number
46 # of bits in the isa that llvm targets, for example, on x86_64 46 # of bits in the isa that llvm targets, for example, on x86_64