Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure init symbol is exported on py3

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-26 08:14:46 +05:30
parent 9cecd227bc
commit f66d6f9fcf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup/build.py
View File

@ -16,6 +16,11 @@ isunix = islinux or isosx or isbsd or ishaiku
py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2]) py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2])
def init_symbol_name(name):
prefix = 'PyInit_' if sys.version_info.major > 2 else 'init'
return prefix + name
def absolutize(paths): def absolutize(paths):
return list(set([x if os.path.isabs(x) else os.path.join(SRC, x.replace('/', os.sep)) for x in paths])) return list(set([x if os.path.isabs(x) else os.path.join(SRC, x.replace('/', os.sep)) for x in paths]))
@ -330,7 +335,7 @@ class Build(Command):
cmd = [linker] cmd = [linker]
if iswindows: if iswindows:
cmd += self.env.ldflags + ext.ldflags + elib + xlib + \ cmd += self.env.ldflags + ext.ldflags + elib + xlib + \
['/EXPORT:init'+ext.name] + objects + ext.extra_objs + ['/OUT:'+dest] ['/EXPORT:' + init_symbol_name(ext.name)] + objects + ext.extra_objs + ['/OUT:'+dest]
else: else:
cmd += objects + ext.extra_objs + ['-o', dest] + self.env.ldflags + ext.ldflags + elib + xlib cmd += objects + ext.extra_objs + ['-o', dest] + self.env.ldflags + ext.ldflags + elib + xlib
self.info('\n\n', ' '.join(cmd), '\n\n') self.info('\n\n', ' '.join(cmd), '\n\n')
@ -486,7 +491,7 @@ class Build(Command):
# Ensure that only the init symbol is exported # Ensure that only the init symbol is exported
pro += '\nQMAKE_LFLAGS += -Wl,--version-script=%s.exp' % sip['target'] pro += '\nQMAKE_LFLAGS += -Wl,--version-script=%s.exp' % sip['target']
with open(os.path.join(src_dir, sip['target'] + '.exp'), 'wb') as f: with open(os.path.join(src_dir, sip['target'] + '.exp'), 'wb') as f:
f.write(('{ global: init%s; local: *; };' % sip['target']).encode('utf-8')) f.write(('{ global: %s; local: *; };' % init_symbol_name(sip['target'])).encode('utf-8'))
if ext.qt_private_headers: if ext.qt_private_headers:
qph = ' '.join(x + '-private' for x in ext.qt_private_headers) qph = ' '.join(x + '-private' for x in ext.qt_private_headers)
pro += '\nQT += ' + qph pro += '\nQT += ' + qph