pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6: allow modules to set where config takes place in the source



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Mon Feb 8 16:17:14 2021 +0000
Changeset:	28e35dbd465a2a5092c87b541da79345dfbb7cf7

Modified Files:
	qt6-qtbase/Makefile.common

Log Message:
qt6: allow modules to set where config takes place in the source

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=28e35dbd465a2a5092c87b541da79345dfbb7cf7

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

diffstat:
 qt6-qtbase/Makefile.common | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diffs:
diff --git a/qt6-qtbase/Makefile.common b/qt6-qtbase/Makefile.common
index 3577aa5287..1a5cfef901 100644
--- a/qt6-qtbase/Makefile.common
+++ b/qt6-qtbase/Makefile.common
@@ -54,8 +54,9 @@ CONFIGURE_ARGS+=	-cmake-use-default-generator
 .if ${OPSYS} != "Darwin"
 CONFIGURE_ARGS+=	-- -DCMAKE_SKIP_RPATH:BOOL=TRUE
 .endif
+QTCONFDIR?=		.
 do-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${WRKSRC} ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${QTCONFDIR} ${CONFIGURE_ARGS}
 .endif
 
 .if ${OPSYS} == "Darwin"


Home | Main Index | Thread Index | Old Index