GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Fix configure generating setup.py.

Browse Source 
* lang/python/setup.py.in: Handle the case, when substitutions
may be empty.

--

Reported-by: Andreas Metzler
Fixes-commit: ae9258fbf3
GnuPG-bug-id: 6204
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-10-26 11:02:36 +09:00
parent 830e017e5d
commit f1802682c3
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lang/python/setup.py.in
View File

@ -68,22 +68,26 @@ if not gpgme_h:
gpgme_h = os.path.join('@prefix@', 'include', 'gpgme.h') gpgme_h = os.path.join('@prefix@', 'include', 'gpgme.h')
define_macros = [] define_macros = []
libs = '@GPGME_CONFIG_LIBS@'.split(' ') if '@GPGME_CONFIG_LIBS@':
libs = '@GPGME_CONFIG_LIBS@'.split(' ')
else:
libs = []
# Define extra_macros for both the SWIG and C code # Define extra_macros for both the SWIG and C code
for k, v in extra_macros.items(): for k, v in extra_macros.items():
extra_swig_opts.append('-D{0}={1}'.format(k, v)) extra_swig_opts.append('-D{0}={1}'.format(k, v))
define_macros.append((k, str(v))) define_macros.append((k, str(v)))
for item in '@GPGME_CONFIG_CFLAGS@'.split(' '): if '@GPGME_CONFIG_CFLAGS@':
if item.startswith('-I'): for item in '@GPGME_CONFIG_CFLAGS@'.split(' '):
include_dirs.append(item[2:]) if item.startswith('-I'):
elif item.startswith('-D'): include_dirs.append(item[2:])
defitem = item[2:].split('=', 1) elif item.startswith('-D'):
if len(defitem) == 2: defitem = item[2:].split('=', 1)
define_macros.append((defitem[0], defitem[1])) if len(defitem) == 2:
else: define_macros.append((defitem[0], defitem[1]))
define_macros.append((defitem[0], None)) else:
define_macros.append((defitem[0], None))
# Adjust include and library locations in case of win32 # Adjust include and library locations in case of win32
uname_s = os.popen('uname -s').read() uname_s = os.popen('uname -s').read()
@ -165,8 +169,9 @@ class BuildExtFirstHack(build):
def _generate_errors_i(self): def _generate_errors_i(self):
ge_cflags='@GPG_ERROR_CFLAGS@'
gpg_error_content = self._read_header( gpg_error_content = self._read_header(
'gpg-error.h', '@GPG_ERROR_CFLAGS@'.split(' ')) 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else [])
filter_re = re.compile(r'GPG_ERR_[^ ]* =') filter_re = re.compile(r'GPG_ERR_[^ ]* =')
rewrite_re = re.compile(r' *(.*) = .*') rewrite_re = re.compile(r' *(.*) = .*')