pkgsrc-WIP-changes archive

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

py-gitdb: Fix build with clang.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jul 6 11:08:05 2017 +0200
Changeset:	c1bb33e46093e0835e40d8f2bc229f5e91e78b22

Modified Files:
	py-gitdb/distinfo
Added Files:
	py-gitdb/patches/patch-gitdb___fun.c

Log Message:
py-gitdb: Fix build with clang.

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

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

diffstat:
 py-gitdb/distinfo                    |  1 +
 py-gitdb/patches/patch-gitdb___fun.c | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diffs:
diff --git a/py-gitdb/distinfo b/py-gitdb/distinfo
index 453428a9fe..9a87a8ea1f 100644
--- a/py-gitdb/distinfo
+++ b/py-gitdb/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.2 2015/07/04 03:04:36 jihbed Exp $
 SHA1 (gitdb-0.6.4.tar.gz) = 21cbba28199802e73e0c4a83b7c02369bbf8c7d7
 RMD160 (gitdb-0.6.4.tar.gz) = 68c014ea3cce0f9b9a58c8f39b255ea817af0d70
 Size (gitdb-0.6.4.tar.gz) = 400506 bytes
+SHA1 (patch-gitdb___fun.c) = e100dec87942daafcdddc81ae98317637b3d9efc
diff --git a/py-gitdb/patches/patch-gitdb___fun.c b/py-gitdb/patches/patch-gitdb___fun.c
new file mode 100644
index 0000000000..b25bf6e062
--- /dev/null
+++ b/py-gitdb/patches/patch-gitdb___fun.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+PyMODINIT_FUNC usually is a "PyObject*" and clang does not like
+functions of that type returning nothing.
+
+--- gitdb/_fun.c.orig	2014-05-04 19:42:31.000000000 +0000
++++ gitdb/_fun.c
+@@ -89,19 +89,20 @@ static PyMethodDef py_fun[] = {
+ };
+ 
+ #ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+-#define PyMODINIT_FUNC void
++#define PyMODINIT_FUNC void*
+ #endif
+ PyMODINIT_FUNC init_perf(void)
+ {
+ 	PyObject *m;
+ 
+ 	if (PyType_Ready(&DeltaChunkListType) < 0)
+-		return;
++		return NULL;
+ 	
+ 	m = Py_InitModule3("_perf", py_fun, NULL);
+ 	if (m == NULL)
+-		return;
++		return NULL;
+ 	
+ 	Py_INCREF(&DeltaChunkListType);
+ 	PyModule_AddObject(m, "DeltaChunkList", (PyObject *)&DeltaChunkListType);
++	return NULL;
+ }


Home | Main Index | Thread Index | Old Index