Fri Sep 29 09:27:07 2023 UTC ()
pixman: fix build for aarch64 machines with clang; apply pkglint suggestions while here
(adam)
diff -r1.88 -r1.89 pkgsrc/x11/pixman/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/pixman/builtin.mk
diff -r1.14 -r1.15 pkgsrc/x11/pixman/hacks.mk
--- pkgsrc/x11/pixman/Makefile 2022/11/03 08:51:25 1.88
+++ pkgsrc/x11/pixman/Makefile 2023/09/29 09:27:07 1.89
@@ -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 @@
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
--- pkgsrc/x11/pixman/builtin.mk 2022/10/18 11:06:46 1.10
+++ pkgsrc/x11/pixman/builtin.mk 2023/09/29 09:27:07 1.11
@@ -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 @@
# 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
--- pkgsrc/x11/pixman/hacks.mk 2022/05/24 09:55:02 1.14
+++ pkgsrc/x11/pixman/hacks.mk 2023/09/29 09:27:07 1.15
@@ -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 @@
### 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)