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

Remove workarounds that are not needed with the current versions of sip-build

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-03 22:03:05 +05:30
parent b9077e7579
commit 04ad7bc901
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup/build.py
View File

@ -487,7 +487,6 @@ project-factory = "pyqtbuild:PyQtProject"
[tool.sip.project] [tool.sip.project]
sip-files-dir = "." sip-files-dir = "."
sip-module = "PyQt5.sip"
[tool.sip.bindings.pictureflow] [tool.sip.bindings.pictureflow]
headers = {ext.headers} headers = {ext.headers}
@ -524,15 +523,6 @@ sip-file = "{os.path.basename(sipf)}"
cwd = os.getcwd() cwd = os.getcwd()
try: try:
os.chdir(os.path.join(src_dir, 'build')) 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)])) self.check_call([self.env.make] + ([] if iswindows else ['-j%d'%(os.cpu_count() or 1)]))
e = 'pyd' if iswindows else 'so' e = 'pyd' if iswindows else 'so'
m = glob.glob(f'{ext.name}/{ext.name}.*{e}') m = glob.glob(f'{ext.name}/{ext.name}.*{e}')