pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-meson: Fix a couple more test cases.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Sep 4 01:29:22 2016 +0200
Changeset:	3d6733ae81cb76baa7c3799eadcd46bb6412826f

Modified Files:
	py-meson/Makefile
Added Files:
	py-meson/files/meson.build
Removed Files:
	py-meson/TODO

Log Message:
py-meson: Fix a couple more test cases.

This is mostly ready. Still some test breakage, but we would
need to install qt5 etc. for testing to fix them -- not worth the
effort.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d6733ae81cb76baa7c3799eadcd46bb6412826f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-meson/Makefile          | 10 ++++++++--
 py-meson/TODO              |  2 --
 py-meson/files/meson.build |  2 ++
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs:
diff --git a/py-meson/Makefile b/py-meson/Makefile
index d7a7eb1..432f0a8 100644
--- a/py-meson/Makefile
+++ b/py-meson/Makefile
@@ -18,10 +18,16 @@ USE_LANGUAGES=	c c++
 SUBST_CLASSES+=		man
 SUBST_SED.man+=		-e "s,share/man,${PKGMANDIR},"
 SUBST_FILES.man+=	setup.py
-SUBST_STAGE.man+=	pre-configure
-SUBST_MESSAGE.man+=	Fixing man page installation path.
+SUBST_STAGE.man=	pre-configure
+SUBST_MESSAGE.man=	Fixing man page installation path.
+
+post-extract:
+	# see https://github.com/mesonbuild/meson/issues/695
+	# patching does not work, perhaps due to spaces in path?
+	${CP} ${FILESDIR}/meson.build ${WRKSRC}/test\ cases/frameworks/6\ gettext/src/meson.build
 
 do-test:
+	${LN} -s ${PYTHONBIN} ${BUILDLINK_DIR}/bin/python3
 	cd ${WRKSRC} && ${PYTHONBIN} run_tests.py
 
 .include "../../lang/python/egg.mk"
diff --git a/py-meson/TODO b/py-meson/TODO
deleted file mode 100644
index a832f88..0000000
--- a/py-meson/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-Lots of self-test problems on NetBSD, see
-https://github.com/mesonbuild/meson/issues/695
diff --git a/py-meson/files/meson.build b/py-meson/files/meson.build
new file mode 100644
index 0000000..2c10027
--- /dev/null
+++ b/py-meson/files/meson.build
@@ -0,0 +1,2 @@
+executable('intlprog', 'intlmain.c', install : true,
+  dependencies : meson.get_compiler('c').find_library('intl', required : false))


Home | Main Index | Thread Index | Old Index