diff -up qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri --- qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri 2017-10-09 15:08:43.206663093 -0500 +++ qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri 2017-10-09 15:09:52.248208321 -0500 @@ -153,3 +153,19 @@ host_build { use?(system_re2): gn_args += use_system_re2=true #use?(system_protobuf): gn_args += use_system_protobuf=true } + +# yasm is only used on x86, and passing use_system_yasm makes the build fail on +# other architectures (e.g., ARM), so make it conditional on the architecture +contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") { + gn_args += use_system_yasm=true +} + +# link libpci instead of dlopening it, our Qt packaging depends on it anyway +gn_args += linux_link_libpci=true + +# run the unbundling script Chromium provides +CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()" +R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py" +R_G_F_PY_ARGS = "--system-libraries yasm" +log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}") +!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")