Skip to content

Commit bcd364c

Browse files
committed
Show stdout in setup.py, not only stderr
1 parent d6ea8de commit bcd364c

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

setup.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -435,25 +435,25 @@ def prepare_static_build(self, build_platform):
435435
openssl_config_cmd.append(cross_compiling.triplet)
436436
else:
437437
openssl_config_cmd.insert(0, './config')
438-
subprocess.check_output(openssl_config_cmd, cwd=str(openssl_dir), env=env)
439-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(openssl_dir), env=env)
440-
subprocess.check_output(
438+
subprocess.check_call(openssl_config_cmd, cwd=str(openssl_dir), env=env)
439+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(openssl_dir), env=env)
440+
subprocess.check_call(
441441
['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install_sw'], cwd=str(openssl_dir), env=env
442442
)
443443

444444
self.info('Building zlib')
445445
zlib_dir = next(self.build_libs_dir.glob('zlib-*'))
446-
subprocess.check_output(['./configure', prefix_arg], cwd=str(zlib_dir), env=env)
447-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(zlib_dir), env=env)
448-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(zlib_dir), env=env)
446+
subprocess.check_call(['./configure', prefix_arg], cwd=str(zlib_dir), env=env)
447+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(zlib_dir), env=env)
448+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(zlib_dir), env=env)
449449

450450
host_arg = ""
451451
if cross_compiling:
452452
host_arg = '--host={}'.format(cross_compiling.arch)
453453

454454
self.info('Building libiconv')
455455
libiconv_dir = next(self.build_libs_dir.glob('libiconv-*'))
456-
subprocess.check_output(
456+
subprocess.check_call(
457457
[
458458
'./configure',
459459
prefix_arg,
@@ -464,14 +464,14 @@ def prepare_static_build(self, build_platform):
464464
cwd=str(libiconv_dir),
465465
env=env,
466466
)
467-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libiconv_dir), env=env)
468-
subprocess.check_output(
467+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libiconv_dir), env=env)
468+
subprocess.check_call(
469469
['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(libiconv_dir), env=env
470470
)
471471

472472
self.info('Building LibXML2')
473473
libxml2_dir = next(self.build_libs_dir.glob('libxml2-*'))
474-
subprocess.check_output(
474+
subprocess.check_call(
475475
[
476476
'./configure',
477477
prefix_arg,
@@ -486,14 +486,14 @@ def prepare_static_build(self, build_platform):
486486
cwd=str(libxml2_dir),
487487
env=env,
488488
)
489-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libxml2_dir), env=env)
490-
subprocess.check_output(
489+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libxml2_dir), env=env)
490+
subprocess.check_call(
491491
['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(libxml2_dir), env=env
492492
)
493493

494494
self.info('Building libxslt')
495495
libxslt_dir = next(self.build_libs_dir.glob('libxslt-*'))
496-
subprocess.check_output(
496+
subprocess.check_call(
497497
[
498498
'./configure',
499499
prefix_arg,
@@ -507,16 +507,16 @@ def prepare_static_build(self, build_platform):
507507
cwd=str(libxslt_dir),
508508
env=env,
509509
)
510-
subprocess.check_output(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libxslt_dir), env=env)
511-
subprocess.check_output(
510+
subprocess.check_call(['make', '-j{}'.format(multiprocessing.cpu_count() + 1)], cwd=str(libxslt_dir), env=env)
511+
subprocess.check_call(
512512
['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(libxslt_dir), env=env
513513
)
514514

515515
self.info('Building xmlsec1')
516516
ldflags.append('-lpthread')
517517
env['LDFLAGS'] = ' '.join(ldflags)
518518
xmlsec1_dir = next(self.build_libs_dir.glob('xmlsec1-*'))
519-
subprocess.check_output(
519+
subprocess.check_call(
520520
[
521521
'./configure',
522522
prefix_arg,
@@ -537,13 +537,13 @@ def prepare_static_build(self, build_platform):
537537
cwd=str(xmlsec1_dir),
538538
env=env,
539539
)
540-
subprocess.check_output(
540+
subprocess.check_call(
541541
['make', '-j{}'.format(multiprocessing.cpu_count() + 1)]
542542
+ ['-I{}'.format(str(self.prefix_dir / 'include')), '-I{}'.format(str(self.prefix_dir / 'include' / 'libxml'))],
543543
cwd=str(xmlsec1_dir),
544544
env=env,
545545
)
546-
subprocess.check_output(
546+
subprocess.check_call(
547547
['make', '-j{}'.format(multiprocessing.cpu_count() + 1), 'install'], cwd=str(xmlsec1_dir), env=env
548548
)
549549

0 commit comments

Comments
 (0)