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

Fix building of sqlite_extension on ancient Linux

Browse Source
This commit is contained in:
Kovid Goyal 2021-06-16 17:14:31 +05:30
parent d8595e5bf5
commit a37c14499c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
setup/build.py
View File

@ -5,7 +5,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import textwrap, os, shlex, subprocess, glob, shutil, sys, json import textwrap, os, shlex, subprocess, glob, shutil, sys, json, errno
from collections import namedtuple from collections import namedtuple
from setup import Command, islinux, isbsd, isfreebsd, ismacos, ishaiku, SRC, iswindows from setup import Command, islinux, isbsd, isfreebsd, ismacos, ishaiku, SRC, iswindows
@ -279,6 +279,14 @@ class Build(Command):
parser.add_option('--sanitize', default=False, action='store_true', parser.add_option('--sanitize', default=False, action='store_true',
help='Build with sanitization support. Run with LD_PRELOAD=$(gcc -print-file-name=libasan.so)') help='Build with sanitization support. Run with LD_PRELOAD=$(gcc -print-file-name=libasan.so)')
def dump_db(self, name, db):
try:
with open(f'{name}_commands.json', 'w') as f:
json.dump(db, f, indent=2)
except OSError as err:
if err.errno != errno.EROFS:
raise
def run(self, opts): def run(self, opts):
from setup.parallel_build import parallel_build, create_job from setup.parallel_build import parallel_build, create_job
if opts.no_compile: if opts.no_compile:
@ -314,8 +322,7 @@ class Build(Command):
objects_map[id(ext)] = objects objects_map[id(ext)] = objects
for cmd in cmds: for cmd in cmds:
jobs.append(create_job(cmd.cmd)) jobs.append(create_job(cmd.cmd))
with open('compile_commands.json', 'w') as f: self.dump_db('compile', ccdb)
json.dump(ccdb, f, indent=2)
if jobs: if jobs:
self.info(f'Compiling {len(jobs)} files...') self.info(f'Compiling {len(jobs)} files...')
if not parallel_build(jobs, self.info): if not parallel_build(jobs, self.info):
@ -327,8 +334,7 @@ class Build(Command):
if cmd is not None: if cmd is not None:
link_commands.append(cmd) link_commands.append(cmd)
jobs.append(create_job(cmd.cmd)) jobs.append(create_job(cmd.cmd))
with open('link_commands.json', 'w') as f: self.dump_db('link', lddb)
json.dump(lddb, f, indent=2)
if jobs: if jobs:
self.info(f'Linking {len(jobs)} files...') self.info(f'Linking {len(jobs)} files...')
if not parallel_build(jobs, self.info): if not parallel_build(jobs, self.info):

1
setup/extensions.json
View File

@ -74,6 +74,7 @@
{ {
"name": "sqlite_extension", "name": "sqlite_extension",
"sources": "calibre/db/sqlite_extension.cpp", "sources": "calibre/db/sqlite_extension.cpp",
"needs_c++11": true,
"libraries": "icudata icui18n icuuc icuio", "libraries": "icudata icui18n icuuc icuio",
"windows_libraries": "icudt icuin icuuc icuio", "windows_libraries": "icudt icuin icuuc icuio",
"lib_dirs": "!icu_lib_dirs", "lib_dirs": "!icu_lib_dirs",