From 6175b6930f63fd7e4f6f163bed23552f5efdce57 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 28 Mar 2019 13:59:16 -0700 Subject: [PATCH] Build libjpeg with -DBUILD_SHARED_LIBS=OFF in test code. NFC. This fixes the breakage with latest llvm upstream that honors `-fPIC`. --- tests/test_core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_core.py b/tests/test_core.py index 650f054e34fa6..07e9808b01db8 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -5645,8 +5645,8 @@ def line_splitter(data): [os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/index.c.o'.split('/')), os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/convert.c.o'.split('/')), os.path.sep.join('codec/CMakeFiles/j2k_to_image.dir/__/common/color.c.o'.split('/')), - os.path.join('bin', 'libopenjpeg.so.1.4.0')], - configure=['cmake', '.'], + os.path.join('bin', 'libopenjpeg.a')], + configure=['cmake', '.', '-DBUILD_SHARED_LIBS=OFF'], # configure_args=['--enable-tiff=no', '--enable-jp3d=no', '--enable-png=no'], make_args=[]) # no -j 2, since parallel builds can fail