mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Remove workarounds that are not needed with the current versions of sip-build
This commit is contained in:
parent
b9077e7579
commit
04ad7bc901
@ -487,7 +487,6 @@ project-factory = "pyqtbuild:PyQtProject"
|
||||
|
||||
[tool.sip.project]
|
||||
sip-files-dir = "."
|
||||
sip-module = "PyQt5.sip"
|
||||
|
||||
[tool.sip.bindings.pictureflow]
|
||||
headers = {ext.headers}
|
||||
@ -524,15 +523,6 @@ sip-file = "{os.path.basename(sipf)}"
|
||||
cwd = os.getcwd()
|
||||
try:
|
||||
os.chdir(os.path.join(src_dir, 'build'))
|
||||
if ext.needs_exceptions:
|
||||
# bug in sip-build
|
||||
for q in walk('.'):
|
||||
if os.path.basename(q) in ('Makefile',):
|
||||
with open(q, 'r+') as f:
|
||||
raw = f.read()
|
||||
raw = raw.replace('-fno-exceptions', '-fexceptions')
|
||||
f.seek(0), f.truncate()
|
||||
f.write(raw)
|
||||
self.check_call([self.env.make] + ([] if iswindows else ['-j%d'%(os.cpu_count() or 1)]))
|
||||
e = 'pyd' if iswindows else 'so'
|
||||
m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
|
||||
|
Loading…
x
Reference in New Issue
Block a user