CVS commit: pkgsrc/x11/qt6-qtbase

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

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Sep 28 09:54:42 UTC 2023

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

Log Message:
Qt6: set CMAKE_APPLE_SILICON_PROCESSOR on arm64

Set CMAKE_APPLE_SILICON_PROCESSOR just like other cmake builds.
The Qt6 configure script acts outside the settings in devel/cmake
so we have to replicate them to get the same environment.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/qt6-qtbase/Makefile
cvs rdiff -u -r1.34 -r1.35 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.12 pkgsrc/x11/qt6-qtbase/Makefile:1.13
--- pkgsrc/x11/qt6-qtbase/Makefile:1.12 Mon Aug 14 05:25:35 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile      Thu Sep 28 09:54:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/08/14 05:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/09/28 09:54:42 nros Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt6-qtbase-${QTVERSION}
@@ -197,6 +197,9 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${QTPRE
 .else
 CONFIGURE_ARGS+=       -DCMAKE_SKIP_RPATH:BOOL=OFF
 CONFIGURE_ARGS+=       -DCMAKE_INSTALL_NAME_DIR:PATH=${QTPREFIX}/lib
+.if !empty(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.34 pkgsrc/x11/qt6-qtbase/Makefile.common:1.35
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.34  Fri Aug  4 19:44:00 2023
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Thu Sep 28 09:54:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2023/08/04 19:44:00 adam Exp $
+# $NetBSD: Makefile.common,v 1.35 2023/09/28 09:54:42 nros Exp $
 # used by audio/qt6-qtspeech/Makefile
 # used by comms/qt6-qtconnectivity/Makefile
 # used by databases/qt6-odbc/Makefile
@@ -88,6 +88,9 @@ CONFIGURE_ARGS+=      -- -DCMAKE_SKIP_RPATH:B
 .  else
 CONFIGURE_ARGS+=       -- -DCMAKE_SKIP_RPATH:BOOL=OFF
 CONFIGURE_ARGS+=       -DCMAKE_INSTALL_NAME_DIR:PATH=${QTPREFIX}/lib
+.if !empty(MACHINE_PLATFORM:MDarwin-*-aarch64)
+CONFIGURE_ARGS+=       -DCMAKE_APPLE_SILICON_PROCESSOR=arm64
+.endif
 .  endif
 QTCONFDIR?=            .
 do-configure: