Re: Qt5 qmake option handling (specifically qt5-qtmultimedia)

["Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>]

Am Mon, 12 Jul 2021 16:32:16 +0200
schrieb "Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>: 

> I noticed that x11/qt5-qtmultimedia has ineffective options.mk.

In a similar fashion, here is the needed change to qttools to actually
disable qdoc for the llvm dependency. Observer how the options
apparently have to be explicitly hacked in, but are trivially picked up.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt5-qttools/Makefile,v
retrieving revision 1.75
diff -u -r1.75 Makefile
--- Makefile	21 Apr 2021 11:40:52 -0000	1.75
+++ Makefile	12 Jul 2021 17:21:43 -0000
@@ -18,10 +18,14 @@
 
 .include "../../mk/bsd.options.mk"
 
+QMAKE_ARGS+= --
 .if !empty(PKG_OPTIONS:Mllvm)
 PLIST.llvm=		yes
 MAKE_ENV+=		LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
 .include "../../lang/clang/buildlink3.mk"
+QMAKE_ARGS+=	-qdoc
+.else
+QMAKE_ARGS+=	-no-qdoc
 .endif
 
 .include "../../x11/qt5-qtbase/Makefile.common"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt5-qttools/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo	21 Nov 2020 11:22:34 -0000	1.20
+++ distinfo	12 Jul 2021 17:21:43 -0000
@@ -6,3 +6,4 @@
 Size (qttools-everywhere-src-5.15.2.tar.xz) = 8894728 bytes
 SHA1 (patch-src_assistant_assistant_assistant.pro) = 8d7cb7759d3b20780bc05097d5bd0d8be7d145cc
 SHA1 (patch-src_designer_src_plugins_plugins.pro) = c82d154785e19ebfb3e191f08c8e7f9b07458d4a
+SHA1 (patch-src_qdoc_configure.json) = 634ae441cc6eb57396261d5d7553afab2c8dad1a
Index: patches/patch-src_qdoc_configure.json
===================================================================
RCS file: patches/patch-src_qdoc_configure.json
diff -N patches/patch-src_qdoc_configure.json
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_qdoc_configure.json	12 Jul 2021 17:21:43 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Add config switch to disable llvm dependency. Seems to be that simple.
+
+--- src/qdoc/configure.json.orig	2021-07-12 16:32:50.358821257 +0000
++++ src/qdoc/configure.json
+@@ -1,5 +1,10 @@
+ {
+     "module": "qdoc",
++    "commandline": {
++        "options": {
++            "qdoc": "boolean"
++        }
++    },
+     "tests": {
+         "libclang": {
+             "label": "libclang",


Do we want that?


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg