Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1695979628280160"
MIME-Version: 1.0
Date: Fri, 29 Sep 2023 09:27:08 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/x11/pixman
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: adam@netbsd.org
Message-Id: <20230929092708.09D44FBDB@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1695979628280160
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Sep 29 09:27:07 UTC 2023

Modified Files:
	pkgsrc/x11/pixman: Makefile builtin.mk hacks.mk

Log Message:
pixman: fix build for aarch64 machines with clang; apply pkglint suggestions while here


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/pixman/builtin.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/pixman/hacks.mk

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


--_----------=_1695979628280160
Content-Disposition: inline
Content-Length: 2587
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.88 pkgsrc/x11/pixman/Makefile:1.89
--- pkgsrc/x11/pixman/Makefile:1.88	Thu Nov  3 08:51:25 2022
+++ pkgsrc/x11/pixman/Makefile	Fri Sep 29 09:27:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2022/11/03 08:51:25 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2023/09/29 09:27:07 adam Exp $
 
 DISTNAME=	pixman-0.42.2
 CATEGORIES=	x11
@@ -22,7 +22,7 @@ USE_TOOLS+=	perl
 CONFIGURE_ARGS+=	--disable-sse2
 .endif
 
-.if ${MACHINE_PLATFORM:MDarwin-*-aarch64}
+.if ${PKGSRC_COMPILER:Mclang} && ${MACHINE_ARCH} == "aarch64"
 # NEON macros depend on GNU as, but Xcode ships llvm-as
 CONFIGURE_ARGS+=	--disable-arm-a64-neon
 .endif

Index: pkgsrc/x11/pixman/builtin.mk
diff -u pkgsrc/x11/pixman/builtin.mk:1.10 pkgsrc/x11/pixman/builtin.mk:1.11
--- pkgsrc/x11/pixman/builtin.mk:1.10	Tue Oct 18 11:06:46 2022
+++ pkgsrc/x11/pixman/builtin.mk	Fri Sep 29 09:27:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.10 2022/10/18 11:06:46 wiz Exp $
+# $NetBSD: builtin.mk,v 1.11 2023/09/29 09:27:07 adam Exp $
 
 BUILTIN_PKG:=		pixman
 PKGCONFIG_FILE.pixman=	${X11BASE}/lib/pkgconfig/pixman-1.pc
@@ -11,8 +11,8 @@ PKGCONFIG_FILE.pixman+=	${X11BASE}/lib${
 # Mac OS 10.5.4 or newer which references a non-existing version of the
 # PNG shared library.
 CHECK_BUILTIN.pixman?=	no
-.if ${CHECK_BUILTIN.pixman:M[nN][oO]} && \
-    ${USE_BUILTIN.pixman:M[Yy][Ee][Ss]} && \
-    !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
+.if ${CHECK_BUILTIN.pixman:tl} == no && \
+    ${USE_BUILTIN.pixman:tl} == yes && \
+    ${MACHINE_PLATFORM:MDarwin-9.*-*}
 BUILDLINK_TRANSFORM+=	opt:-lpixman-1.0.10.0:-lpixman-1
 .endif

Index: pkgsrc/x11/pixman/hacks.mk
diff -u pkgsrc/x11/pixman/hacks.mk:1.14 pkgsrc/x11/pixman/hacks.mk:1.15
--- pkgsrc/x11/pixman/hacks.mk:1.14	Tue May 24 09:55:02 2022
+++ pkgsrc/x11/pixman/hacks.mk	Fri Sep 29 09:27:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.14 2022/05/24 09:55:02 nia Exp $
+# $NetBSD: hacks.mk,v 1.15 2023/09/29 09:27:07 adam Exp $
 #
 .if !defined(PIXMAN_HACKS_MK)
 PIXMAN_HACKS_MK=	# empty
@@ -8,11 +8,11 @@ PIXMAN_HACKS_MK=	# empty
 ### XXX SSE2 intrinsics require gcc-4.2+ to build.
 ### XXX Need to disable SSSE3 explicitly, too.
 ###
-.if empty(CC_VERSION:Mgcc-4.[2-9]*) && \
-    empty(CC_VERSION:Mgcc-[5-9].*) && \
-    empty(CC_VERSION:Mgcc-[1-9][0-9]*)
+.  if !${CC_VERSION:Mgcc-4.[2-9]*} && \
+    !${CC_VERSION:Mgcc-[5-9].*} && \
+    !${CC_VERSION:Mgcc-[1-9][0-9]*}
 CONFIGURE_ARGS+=	--disable-sse2 --disable-ssse3
-.endif
+.  endif
 .endif
 
 .if !empty(PKGSRC_COMPILER:Msunpro)


--_----------=_1695979628280160--