CVS commit: pkgsrc/x11/qt4-libs

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Sep 13 20:07:54 UTC 2023

Modified Files:
        pkgsrc/x11/qt4-libs: Makefile.common buildlink3.mk hacks.mk

Log Message:
qt4-libs: Mark not for Darwin aarch64

pkgsrc changes:
---------------
  * An asm error occurs during building step and Qt4 is supported for MacOS
    versions that only support x86_64. It seems to be safe to mark this
    package not for Darwin-*-aarch64.
  * Apply some pkglint recommendations.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/qt4-libs/Makefile.common
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/qt4-libs/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt4-libs/hacks.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/qt4-libs/Makefile.common
diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.54 pkgsrc/x11/qt4-libs/Makefile.common:1.55
--- pkgsrc/x11/qt4-libs/Makefile.common:1.54    Mon Nov 21 18:20:46 2022
+++ pkgsrc/x11/qt4-libs/Makefile.common Wed Sep 13 20:07:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2022/11/21 18:20:46 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.55 2023/09/13 20:07:53 triaxx Exp $
 # used by x11/qt4-docs/Makefile
 # used by x11/qt4-libs/Makefile
 # used by x11/qt4-mng/Makefile
@@ -19,6 +19,8 @@ DISTINFO_FILE=        ${.CURDIR}/../../x11/qt4-
 FILESDIR=      ${.CURDIR}/../../x11/qt4-libs/files
 PATCHDIR=      ${.CURDIR}/../../x11/qt4-libs/patches
 
+NOT_FOR_PLATFORM=      Darwin-*-aarch64
+
 HAS_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
@@ -72,7 +74,7 @@ SCRIPTS_ENV+=         HOME=${WRKDIR}
 #
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=     -std=c++11 -Wno-c++11-narrowing
-.  if empty(MACHINE_PLATFORM:MDarwin-*-*)
+.  if !${MACHINE_PLATFORM:MDarwin-*-*}
 CXXFLAGS+=     -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
 .  endif
 .elif !empty(PKGSRC_COMPILER:Mgcc)
@@ -144,7 +146,7 @@ SUBST_SED.lt+=              -e 's,$$$${first(QMAKE_E
 # and 3.0.5 for older toolchains. Removing inline for newer toolchains
 # produces smaller code. Removing inline for older toolchains prod-
 # uces buggy code.
-.if !empty(CC_VERSION:Mgcc-2.8*)
+.if ${CC_VERSION:Mgcc-2.8*}
 CXXFLAGS+=             -DQ_INLINE_TEMPLATES=inline
 .endif
 

Index: pkgsrc/x11/qt4-libs/buildlink3.mk
diff -u pkgsrc/x11/qt4-libs/buildlink3.mk:1.53 pkgsrc/x11/qt4-libs/buildlink3.mk:1.54
--- pkgsrc/x11/qt4-libs/buildlink3.mk:1.53      Sun Jan 29 21:15:14 2023
+++ pkgsrc/x11/qt4-libs/buildlink3.mk   Wed Sep 13 20:07:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.53 2023/01/29 21:15:14 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.54 2023/09/13 20:07:53 triaxx Exp $
 
 BUILDLINK_TREE+=       qt4-libs
 
@@ -39,7 +39,7 @@ PTHREAD_OPTS+=        require
 
 pkgbase := qt4-libs
 .include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.qt4-libs:Mgtk2)
+.if ${PKG_BUILD_OPTIONS.qt4-libs:Mgtk2}
 .  include "../../devel/glib2/buildlink3.mk"
 #.  include "../../x11/gtk2/buildlink3.mk"
 .endif

Index: pkgsrc/x11/qt4-libs/hacks.mk
diff -u pkgsrc/x11/qt4-libs/hacks.mk:1.4 pkgsrc/x11/qt4-libs/hacks.mk:1.5
--- pkgsrc/x11/qt4-libs/hacks.mk:1.4    Fri May  5 17:38:00 2017
+++ pkgsrc/x11/qt4-libs/hacks.mk        Wed Sep 13 20:07:53 2023
@@ -1,10 +1,10 @@
-# $NetBSD: hacks.mk,v 1.4 2017/05/05 17:38:00 joerg Exp $
+# $NetBSD: hacks.mk,v 1.5 2023/09/13 20:07:53 triaxx Exp $
 
 ### [Wed Aug  3 12:18:16 UTC 2011 : tron]
 ### If "qmake" is build with "-O2" or better with "g++" under Mac OS X the
 ### resulting binary will crash. This fixes PR pkg/44716 by Richard Hansen.
 .if ${OPSYS} == "Darwin"
-.  if !empty(CC_VERSION:Mgcc*)
+.  if ${CC_VERSION:Mgcc*}
 PKG_HACKS+=            macosx-codegen
 BUILDLINK_TRANSFORM+=  opt:-O[0-9]*:-O1
 .  endif
@@ -15,7 +15,7 @@ BUILDLINK_TRANSFORM+= opt:-O[0-9]*:-O1
 ### when building gui/painting/qdrawhelper_mmx.cpp.
 ### Building with -O1 instead of -O2 seems to work around the problem.
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-.  if !empty(CC_VERSION:Mgcc-4.5.*)
+.  if ${CC_VERSION:Mgcc-4.5.*}
 PKG_HACKS+=            pr46978
 SUBST_CLASSES+=                pr46978
 SUBST_STAGE.pr46978=   post-configure