25 lines
999 B
Diff
25 lines
999 B
Diff
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
|
|
index 56c18bd..cb17c7a 100644
|
|
--- a/src/buildtools/config/linux.pri
|
|
+++ b/src/buildtools/config/linux.pri
|
|
@@ -176,3 +176,19 @@ host_build {
|
|
}
|
|
gn_args += use_glib=false
|
|
}
|
|
+
|
|
+# 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 python2 $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
|
|
+!system("python2 $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
|