CVS commit: pkgsrc/x11/qt6-qtbase

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Nov  8 09:01:20 UTC 2023

Modified Files:
        pkgsrc/x11/qt6-qtbase: Makefile Makefile.common

Log Message:
qt6: get extra configure arguments from cmake/configure-settings.mk
This makes fixes in the cmake settings for different platforms
to be added to the qt6 build automatically and be in one place
instead of having to replicated in the qt6 packages.
CMAKE_INSTALL_PREFIX had to be set when configuring qt6 modules
or they would be installed under ${PREFIX} instead of ${PREFIX}/qt6.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt6-qtbase/Makefile.common

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/Makefile
diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.18 pkgsrc/x11/qt6-qtbase/Makefile:1.19
--- pkgsrc/x11/qt6-qtbase/Makefile:1.18 Mon Nov  6 19:46:46 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Wed Nov  8 09:01:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/11/06 19:46:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2023/11/08 09:01:20 nros Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -196,16 +196,13 @@ pre-configure:
 
 .include "options.mk"
 
-CONFIGURE_ARGS+=       -- -DQT_DISABLE_RPATH:BOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DQT_DISABLE_RPATH:BOOL=ON
+
+.include "../../devel/cmake/configure-settings.mk"
+
+CONFIGURE_ARGS+=       -- ${CMAKE_CONFIGURE_ARGS}
 .if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=       -DCMAKE_SKIP_RPATH:BOOL=ON
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${QTPREFIX}/lib
-.else
-CONFIGURE_ARGS+=       -DCMAKE_SKIP_RPATH:BOOL=OFF
-CONFIGURE_ARGS+=       -DCMAKE_INSTALL_NAME_DIR:PATH=${QTPREFIX}/lib
-.  if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
-CONFIGURE_ARGS+=       -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
-.  endif
 .endif
 
 TOOL_DEPENDS+= xmlstarlet-[0-9]*:../../textproc/xmlstarlet

Index: pkgsrc/x11/qt6-qtbase/Makefile.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.36 pkgsrc/x11/qt6-qtbase/Makefile.common:1.37
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.36  Tue Oct 31 19:56:48 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Wed Nov  8 09:01:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2023/10/31 19:56:48 adam Exp $
+# $NetBSD: Makefile.common,v 1.37 2023/11/08 09:01:20 nros Exp $
 # used by audio/qt6-qtspeech/Makefile
 # used by comms/qt6-qtconnectivity/Makefile
 # used by databases/qt6-odbc/Makefile
@@ -82,16 +82,9 @@ MAKE_ENV+=   LD_LIBRARY_PATH=${WRKSRC}/lib
 SCRIPTS_ENV+=          HOME=${WRKDIR}
 
 .if "${PKGPATH}" != "x11/qt6-qtbase"
-#CONFIGURE_ARGS+=      -cmake-use-default-generator
-.  if ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=       -- -DCMAKE_SKIP_RPATH:BOOL=ON
-.  else
-CONFIGURE_ARGS+=       -- -DCMAKE_SKIP_RPATH:BOOL=OFF
-CONFIGURE_ARGS+=       -DCMAKE_INSTALL_NAME_DIR:PATH=${QTPREFIX}/lib
-.    if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
-CONFIGURE_ARGS+=       -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
-.    endif
-.  endif
+CMAKE_INSTALL_PREFIX=  ${QTPREFIX}
+.include "../../devel/cmake/configure-settings.mk"
+CONFIGURE_ARGS+=       -- ${CMAKE_CONFIGURE_ARGS}
 QTCONFDIR?=            .
 do-configure:
        cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTPREFIX}/bin/qt-configure-module ${QTCONFDIR} ${CONFIGURE_ARGS}