Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better escaping for flags in the generated toml file for building pyqt extensions

Browse Source
This commit is contained in:
Kovid Goyal 2023-11-27 15:41:12 +05:30
parent 454b5f76e9
commit aa48fc63d0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup/build.py
View File

@ -688,12 +688,12 @@ sip-files-dir = "."
[tool.sip.builder] [tool.sip.builder]
qmake-settings = [ qmake-settings = [
'QMAKE_CC = {self.env.cc}', """QMAKE_CC = {self.env.cc}""",
'QMAKE_CXX = {self.env.cxx}', """QMAKE_CXX = {self.env.cxx}""",
'QMAKE_LINK = {self.env.linker or self.env.cxx}', """QMAKE_LINK = {self.env.linker or self.env.cxx}""",
'QMAKE_CFLAGS += {shlex.join(self.env.base_cflags)}', """QMAKE_CFLAGS += {shlex.join(self.env.base_cflags)}""",
'QMAKE_CXXFLAGS += {shlex.join(self.env.base_cxxflags)}', """QMAKE_CXXFLAGS += {shlex.join(self.env.base_cxxflags)}""",
'QMAKE_LFLAGS += {shlex.join(self.env.base_ldflags)}', """QMAKE_LFLAGS += {shlex.join(self.env.base_ldflags)}""",
] ]
[tool.sip.bindings.{ext.name}] [tool.sip.bindings.{ext.name}]
@ -702,7 +702,7 @@ sources = {ext.sources}
exceptions = {needs_exceptions} exceptions = {needs_exceptions}
include-dirs = {ext.inc_dirs} include-dirs = {ext.inc_dirs}
qmake-QT = {ext.qt_modules} qmake-QT = {ext.qt_modules}
sip-file = "{os.path.basename(sipf)}" sip-file = {os.path.basename(sipf)!r}
''') ''')
shutil.copy2(sipf, src_dir) shutil.copy2(sipf, src_dir)