CVS commit: pkgsrc/x11/qt6-qtbase

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Mon Jan 13 16:56:25 UTC 2025

Modified Files:
        pkgsrc/x11/qt6-qtbase: buildlink3.mk

Log Message:
x11/qt6-qtbase: Expose qt6/bin/ and qt6/libexec/ to builds.

This is not right, but it will mitigates a regression when LOCALBASE
is hidden from cmake, and it can be done properly later along with
everything else that also abuses BUILDLINK_FILES for executables.

Discussion of the upcoming change to hide LOCALBASE from cmake:
https://mail-index.netbsd.org/tech-pkg/2024/12/25/msg030256.html


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt6-qtbase/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt6-qtbase/buildlink3.mk
diff -u pkgsrc/x11/qt6-qtbase/buildlink3.mk:1.17 pkgsrc/x11/qt6-qtbase/buildlink3.mk:1.18
--- pkgsrc/x11/qt6-qtbase/buildlink3.mk:1.17    Thu Dec 26 22:20:15 2024
+++ pkgsrc/x11/qt6-qtbase/buildlink3.mk Mon Jan 13 16:56:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2024/12/26 22:20:15 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2025/01/13 16:56:25 riastradh Exp $
 
 BUILDLINK_TREE+=       qt6-qtbase
 
@@ -13,6 +13,15 @@ BUILDLINK_INCDIRS.qt6-qtbase+=       qt6/inclu
 BUILDLINK_LIBDIRS.qt6-qtbase+= qt6/lib
 BUILDLINK_LIBDIRS.qt6-qtbase+= qt6/plugins
 
+# XXX This is wrong -- we should get build-time executables via
+# TOOL_DEPENDS, not via buildlink3.  See
+# https://mail-index.netbsd.org/tech-pkg/2025/01/12/msg030374.html for
+# details.  We do this anyway for now as an expedient workaround for a
+# bug unearthed by hiding files in LOCALBASE from cmake and limiting it
+# to buildlink3.
+BUILDLINK_FILES.qt6-qtbase+=   qt6/bin/*
+BUILDLINK_FILES.qt6-qtbase+=   qt6/libexec/*
+
 # \todo Fix duplication with prefix coded in Makefile.common
 QTDIR=         ${BUILDLINK_PREFIX.qt6-qtbase}/qt6
 CMAKE_PREFIX_PATH+=    ${QTDIR}