1edc1be941
gpgme 1.7.0 OBS-URL: https://build.opensuse.org/request/show/430543 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=67
128 lines
3.7 KiB
Diff
128 lines
3.7 KiB
Diff
From 3703a4723899d7563937b4b99f5bbe4dd8d3dfed Mon Sep 17 00:00:00 2001
|
|
From: Justus Winter <justus@g10code.com>
|
|
Date: Mon, 26 Sep 2016 11:35:40 +0200
|
|
Subject: [PATCH] python: Include 'config.h'.
|
|
|
|
* lang/python/Makefile.am: Pass 'top_builddir' to 'setup.py'.
|
|
* lang/python/gpgme.i: Include 'config.h'.
|
|
* lang/python/helpers.c: Likewise.
|
|
* lang/python/helpers.h: Likewise.
|
|
* lang/python/setup.py.in: Make sure that 'config.h' can be found.
|
|
--
|
|
Fixes build on 32 bit platforms with large file support.
|
|
|
|
Signed-off-by: Justus Winter <justus@g10code.com>
|
|
---
|
|
lang/python/Makefile.am | 1 +
|
|
lang/python/gpgme.i | 8 ++++++++
|
|
lang/python/helpers.c | 4 ++++
|
|
lang/python/helpers.h | 4 ++++
|
|
lang/python/setup.py.in | 7 ++++++-
|
|
5 files changed, 23 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
|
|
index 2271ce0..1d7aee8 100644
|
|
--- a/lang/python/Makefile.am
|
|
+++ b/lang/python/Makefile.am
|
|
@@ -56,6 +56,7 @@ copystamp: $(COPY_FILES) $(COPY_FILES_PYME)
|
|
all-local: copystamp
|
|
for PYTHON in $(PYTHONS); do \
|
|
CFLAGS="$(CFLAGS) -I$(top_srcdir)" \
|
|
+ top_builddir="$(top_builddir)" \
|
|
$$PYTHON setup.py build --verbose ; \
|
|
done
|
|
|
|
diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i
|
|
index 84addae..a4672e1 100644
|
|
--- a/lang/python/gpgme.i
|
|
+++ b/lang/python/gpgme.i
|
|
@@ -547,6 +547,10 @@
|
|
some structs, which we provide prior to including the version for
|
|
SWIG. */
|
|
%{
|
|
+#ifdef HAVE_CONFIG_H
|
|
+#include "config.h"
|
|
+#endif
|
|
+
|
|
#include <gpgme.h>
|
|
%}
|
|
|
|
@@ -575,6 +579,10 @@ struct _gpgme_sig_notation
|
|
|
|
/* Now include our local modified version. Any structs defined above
|
|
are ignored. */
|
|
+#ifdef HAVE_CONFIG_H
|
|
+%include "config.h"
|
|
+#endif
|
|
+
|
|
%include "gpgme.h"
|
|
|
|
%include "errors.i"
|
|
diff --git a/lang/python/helpers.c b/lang/python/helpers.c
|
|
index f9aec91..3724752 100644
|
|
--- a/lang/python/helpers.c
|
|
+++ b/lang/python/helpers.c
|
|
@@ -18,6 +18,10 @@
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
+#ifdef HAVE_CONFIG_H
|
|
+#include "config.h"
|
|
+#endif
|
|
+
|
|
#include <assert.h>
|
|
#include <stdio.h>
|
|
#include <gpgme.h>
|
|
diff --git a/lang/python/helpers.h b/lang/python/helpers.h
|
|
index 9200f93..67d23b2 100644
|
|
--- a/lang/python/helpers.h
|
|
+++ b/lang/python/helpers.h
|
|
@@ -18,6 +18,10 @@
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
+#ifdef HAVE_CONFIG_H
|
|
+#include "config.h"
|
|
+#endif
|
|
+
|
|
#include <gpgme.h>
|
|
#include "Python.h"
|
|
|
|
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
|
|
index 31892c1..7af2d48 100755
|
|
--- a/lang/python/setup.py.in
|
|
+++ b/lang/python/setup.py.in
|
|
@@ -28,6 +28,7 @@ gpg_error_config = ["gpg-error-config"]
|
|
gpgme_config_flags = ["--thread=pthread"]
|
|
gpgme_config = ["gpgme-config"] + gpgme_config_flags
|
|
gpgme_h = ""
|
|
+include_dirs = [os.getcwd()]
|
|
library_dirs = []
|
|
in_tree = False
|
|
extra_swig_opts = []
|
|
@@ -38,8 +39,13 @@ if os.path.exists("../../src/gpgme-config"):
|
|
in_tree = True
|
|
gpgme_config = ["../../src/gpgme-config"] + gpgme_config_flags
|
|
gpgme_h = "../../src/gpgme.h"
|
|
+ if 'top_builddir' in os.environ:
|
|
+ include_dirs.append(os.environ['top_builddir'])
|
|
+ # Make sure that SWIG finds config.h when processing gpgme.i.
|
|
+ extra_swig_opts.append("-I{0}".format(os.environ['top_builddir']))
|
|
library_dirs = ["../../src/.libs"] # XXX uses libtool internals
|
|
extra_macros.update(
|
|
+ HAVE_CONFIG_H=1,
|
|
HAVE_DATA_H=1,
|
|
IN_TREE_BUILD=1,
|
|
)
|
|
@@ -94,7 +100,6 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpgme_h],
|
|
subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h],
|
|
stdout=open("errors.i", "w"))
|
|
|
|
-include_dirs = [os.getcwd()]
|
|
define_macros = []
|
|
libs = getconfig('libs')
|
|
|
|
--
|
|
2.10.0
|
|
|