mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
make sure calibre's build process obeys MAKE_JOBS, instead of eating
all known CPUs. OK sthen@
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
COMMENT = ebook management application
|
COMMENT = ebook management application
|
||||||
|
|
||||||
V = 8.0.1
|
V = 8.0.1
|
||||||
REVISION = 0
|
REVISION = 1
|
||||||
DISTNAME = calibre-$V
|
DISTNAME = calibre-$V
|
||||||
|
|
||||||
CATEGORIES = textproc
|
CATEGORIES = textproc
|
||||||
@@ -81,6 +81,7 @@ LDFLAGS += -L${LOCALBASE}/lib
|
|||||||
MAKE_ENV += CALIBRE_PY3_PORT=1 \
|
MAKE_ENV += CALIBRE_PY3_PORT=1 \
|
||||||
FT_LIB_DIR="${X11BASE}/lib" \
|
FT_LIB_DIR="${X11BASE}/lib" \
|
||||||
LDFLAGS="${LDFLAGS}" \
|
LDFLAGS="${LDFLAGS}" \
|
||||||
|
MAKE_JOBS=${MAKE_JOBS} \
|
||||||
OVERRIDE_CFLAGS="${CFLAGS}" \
|
OVERRIDE_CFLAGS="${CFLAGS}" \
|
||||||
OVERRIDE_LDFLAGS="${LDFLAGS}" \
|
OVERRIDE_LDFLAGS="${LDFLAGS}" \
|
||||||
PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
|
PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
|
||||||
|
|||||||
@@ -21,3 +21,20 @@ Index: setup/build.py
|
|||||||
|
|
||||||
if ishaiku:
|
if ishaiku:
|
||||||
cflags.append('-lpthread')
|
cflags.append('-lpthread')
|
||||||
|
@@ -726,6 +729,7 @@ sip-file = {os.path.basename(sipf)!r}
|
||||||
|
|
||||||
|
def build_pyqt_extension(self, ext, sbf):
|
||||||
|
self.info(f'\n####### Building {ext.name} extension', '#'*7)
|
||||||
|
+ cpu_count = os.environ.get('MAKE_JOBS', '1')
|
||||||
|
src_dir = os.path.dirname(sbf)
|
||||||
|
cwd = os.getcwd()
|
||||||
|
try:
|
||||||
|
@@ -733,7 +737,7 @@ sip-file = {os.path.basename(sipf)!r}
|
||||||
|
env = os.environ.copy()
|
||||||
|
if is_macos_universal_build:
|
||||||
|
env['ARCHS'] = 'x86_64 arm64'
|
||||||
|
- self.check_call([self.env.make] + ([] if iswindows else [f'-j{os.cpu_count() or 1}']), env=env)
|
||||||
|
+ self.check_call([self.env.make] + ([] if iswindows else [f'-j{cpu_count or 1}']), env=env)
|
||||||
|
e = 'pyd' if iswindows else 'so'
|
||||||
|
m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
|
||||||
|
if not m:
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
Index: setup/parallel_build.py
|
||||||
|
--- setup/parallel_build.py.orig
|
||||||
|
+++ setup/parallel_build.py
|
||||||
|
@@ -22,6 +22,8 @@ Job = namedtuple('Job', 'cmd human_text cwd')
|
||||||
|
|
||||||
|
cpu_count = min(16, max(1, os.cpu_count()))
|
||||||
|
|
||||||
|
+# let MAKE_JOBS override how many cpus are used
|
||||||
|
+cpu_count = min(cpu_count, int(os.environ.get('MAKE_JOBS', 1)))
|
||||||
|
|
||||||
|
def run_worker(job, decorate=True):
|
||||||
|
cmd, human_text = job.cmd, job.human_text
|
||||||
Reference in New Issue
Block a user