From 1cc7277996ef129b07d078aa0a99d01d7039e880 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 1 May 2020 00:04:35 +0200 Subject: [PATCH] qt5: don't build webkit-related libraries for arm_v8a Fixes #3747 --- .../lib/mk/{qt5_angle.mk => qt5_angle.inc} | 0 .../lib/mk/{qt5_webkit.mk => qt5_webkit.inc} | 0 ..._webkitwidgets.mk => qt5_webkitwidgets.inc} | 0 .../lib/mk/{qt5_wtf.mk => qt5_wtf.inc} | 0 repos/libports/lib/mk/spec/32bit/qt5_angle.mk | 1 + repos/libports/lib/mk/spec/32bit/qt5_webkit.mk | 1 + .../lib/mk/spec/32bit/qt5_webkitwidgets.mk | 1 + repos/libports/lib/mk/spec/32bit/qt5_wtf.mk | 1 + repos/libports/lib/mk/spec/x86_64/qt5_angle.mk | 1 + .../libports/lib/mk/spec/x86_64/qt5_webkit.mk | 1 + .../lib/mk/spec/x86_64/qt5_webkitwidgets.mk | 1 + repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk | 1 + .../libports/recipes/src/qt5_webkit/content.mk | 18 +++++++++++++----- 13 files changed, 21 insertions(+), 5 deletions(-) rename repos/libports/lib/mk/{qt5_angle.mk => qt5_angle.inc} (100%) rename repos/libports/lib/mk/{qt5_webkit.mk => qt5_webkit.inc} (100%) rename repos/libports/lib/mk/{qt5_webkitwidgets.mk => qt5_webkitwidgets.inc} (100%) rename repos/libports/lib/mk/{qt5_wtf.mk => qt5_wtf.inc} (100%) create mode 100644 repos/libports/lib/mk/spec/32bit/qt5_angle.mk create mode 100644 repos/libports/lib/mk/spec/32bit/qt5_webkit.mk create mode 100644 repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk create mode 100644 repos/libports/lib/mk/spec/32bit/qt5_wtf.mk create mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_angle.mk create mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk create mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk create mode 100644 repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk diff --git a/repos/libports/lib/mk/qt5_angle.mk b/repos/libports/lib/mk/qt5_angle.inc similarity index 100% rename from repos/libports/lib/mk/qt5_angle.mk rename to repos/libports/lib/mk/qt5_angle.inc diff --git a/repos/libports/lib/mk/qt5_webkit.mk b/repos/libports/lib/mk/qt5_webkit.inc similarity index 100% rename from repos/libports/lib/mk/qt5_webkit.mk rename to repos/libports/lib/mk/qt5_webkit.inc diff --git a/repos/libports/lib/mk/qt5_webkitwidgets.mk b/repos/libports/lib/mk/qt5_webkitwidgets.inc similarity index 100% rename from repos/libports/lib/mk/qt5_webkitwidgets.mk rename to repos/libports/lib/mk/qt5_webkitwidgets.inc diff --git a/repos/libports/lib/mk/qt5_wtf.mk b/repos/libports/lib/mk/qt5_wtf.inc similarity index 100% rename from repos/libports/lib/mk/qt5_wtf.mk rename to repos/libports/lib/mk/qt5_wtf.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_angle.mk b/repos/libports/lib/mk/spec/32bit/qt5_angle.mk new file mode 100644 index 000000000..516a6cb5d --- /dev/null +++ b/repos/libports/lib/mk/spec/32bit/qt5_angle.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_angle.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk b/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk new file mode 100644 index 000000000..d4db5de5b --- /dev/null +++ b/repos/libports/lib/mk/spec/32bit/qt5_webkit.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_webkit.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk b/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk new file mode 100644 index 000000000..e0827d773 --- /dev/null +++ b/repos/libports/lib/mk/spec/32bit/qt5_webkitwidgets.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_webkitwidgets.inc diff --git a/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk b/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk new file mode 100644 index 000000000..92d284426 --- /dev/null +++ b/repos/libports/lib/mk/spec/32bit/qt5_wtf.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_wtf.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk b/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk new file mode 100644 index 000000000..516a6cb5d --- /dev/null +++ b/repos/libports/lib/mk/spec/x86_64/qt5_angle.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_angle.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk b/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk new file mode 100644 index 000000000..d4db5de5b --- /dev/null +++ b/repos/libports/lib/mk/spec/x86_64/qt5_webkit.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_webkit.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk b/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk new file mode 100644 index 000000000..e0827d773 --- /dev/null +++ b/repos/libports/lib/mk/spec/x86_64/qt5_webkitwidgets.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_webkitwidgets.inc diff --git a/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk b/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk new file mode 100644 index 000000000..92d284426 --- /dev/null +++ b/repos/libports/lib/mk/spec/x86_64/qt5_wtf.mk @@ -0,0 +1 @@ +include $(REP_DIR)/lib/mk/qt5_wtf.inc diff --git a/repos/libports/recipes/src/qt5_webkit/content.mk b/repos/libports/recipes/src/qt5_webkit/content.mk index fc6d8ad34..c58f79f60 100644 --- a/repos/libports/recipes/src/qt5_webkit/content.mk +++ b/repos/libports/recipes/src/qt5_webkit/content.mk @@ -1,20 +1,28 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_angle.mk \ +MIRROR_FROM_REP_DIR := lib/mk/qt5_angle.inc \ lib/mk/qt5_angle_generated.inc \ lib/mk/qt5_jscore.inc \ lib/mk/qt5_jscore_generated.inc \ lib/mk/qt5_webcore.inc \ lib/mk/qt5_webcore_generated.inc \ - lib/mk/qt5_webkit.mk \ + lib/mk/qt5_webkit.inc \ lib/mk/qt5_webkit_generated.inc \ - lib/mk/qt5_webkitwidgets.mk \ + lib/mk/qt5_webkitwidgets.inc \ lib/mk/qt5_webkitwidgets_generated.inc \ - lib/mk/qt5_wtf.mk \ + lib/mk/qt5_wtf.inc \ lib/mk/qt5_wtf_generated.inc \ lib/mk/qt5.inc \ + lib/mk/spec/32bit/qt5_angle.mk \ lib/mk/spec/32bit/qt5_jscore.mk \ lib/mk/spec/32bit/qt5_webcore.mk \ + lib/mk/spec/32bit/qt5_webkit.mk \ + lib/mk/spec/32bit/qt5_webkitwidgets.mk \ + lib/mk/spec/32bit/qt5_wtf.mk \ + lib/mk/spec/x86_64/qt5_angle.mk \ lib/mk/spec/x86_64/qt5_jscore.mk \ - lib/mk/spec/x86_64/qt5_webcore.mk + lib/mk/spec/x86_64/qt5_webcore.mk \ + lib/mk/spec/x86_64/qt5_webkit.mk \ + lib/mk/spec/x86_64/qt5_webkitwidgets.mk \ + lib/mk/spec/x86_64/qt5_wtf.mk content: $(MIRROR_FROM_REP_DIR) \ src/lib/qt5_angle/target.mk \