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
cvs diff -r1.88 -r1.89 pkgsrc/x11/pixman/Makefile (expand / switch to unified diff)

--- 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,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.88 2022/11/03 08:51:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.89 2023/09/29 09:27:07 adam Exp $
2 2
3DISTNAME= pixman-0.42.2 3DISTNAME= pixman-0.42.2
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= Library of low-level pixel manipulation routines 10COMMENT= Library of low-level pixel manipulation routines
11LICENSE= mit 11LICENSE= mit
12 12
13CHECK_PORTABILITY_SKIP+= Makefile.am # already patched in Makefile.in 13CHECK_PORTABILITY_SKIP+= Makefile.am # already patched in Makefile.in
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= perl 17USE_TOOLS+= perl
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21.if ${MACHINE_ARCH} == i386 21.if ${MACHINE_ARCH} == i386
22CONFIGURE_ARGS+= --disable-sse2 22CONFIGURE_ARGS+= --disable-sse2
23.endif 23.endif
24 24
25.if ${MACHINE_PLATFORM:MDarwin-*-aarch64} 25.if ${PKGSRC_COMPILER:Mclang} && ${MACHINE_ARCH} == "aarch64"
26# NEON macros depend on GNU as, but Xcode ships llvm-as 26# NEON macros depend on GNU as, but Xcode ships llvm-as
27CONFIGURE_ARGS+= --disable-arm-a64-neon 27CONFIGURE_ARGS+= --disable-arm-a64-neon
28.endif 28.endif
29 29
30PKGCONFIG_OVERRIDE+= pixman-1.pc.in 30PKGCONFIG_OVERRIDE+= pixman-1.pc.in
31PKGCONFIG_OVERRIDE+= pixman-1-uninstalled.pc.in 31PKGCONFIG_OVERRIDE+= pixman-1-uninstalled.pc.in
32 32
33TEST_TARGET= check 33TEST_TARGET= check
34 34
35X11_LIB_NAME?= pixman 35X11_LIB_NAME?= pixman
36.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 36.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
37.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/x11/pixman/builtin.mk (expand / switch to unified diff)

--- 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,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: builtin.mk,v 1.10 2022/10/18 11:06:46 wiz Exp $ 1# $NetBSD: builtin.mk,v 1.11 2023/09/29 09:27:07 adam Exp $
2 2
3BUILTIN_PKG:= pixman 3BUILTIN_PKG:= pixman
4PKGCONFIG_FILE.pixman= ${X11BASE}/lib/pkgconfig/pixman-1.pc 4PKGCONFIG_FILE.pixman= ${X11BASE}/lib/pkgconfig/pixman-1.pc
5PKGCONFIG_FILE.pixman+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/pixman-1.pc 5PKGCONFIG_FILE.pixman+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/pixman-1.pc
6 6
7.include "../../mk/buildlink3/pkgconfig-builtin.mk" 7.include "../../mk/buildlink3/pkgconfig-builtin.mk"
8.include "../../mk/x11.builtin.mk" 8.include "../../mk/x11.builtin.mk"
9 9
10# Work around broken libtool archive "/usr/X11/lib/libpixman-1.la" under 10# Work around broken libtool archive "/usr/X11/lib/libpixman-1.la" under
11# Mac OS 10.5.4 or newer which references a non-existing version of the 11# Mac OS 10.5.4 or newer which references a non-existing version of the
12# PNG shared library. 12# PNG shared library.
13CHECK_BUILTIN.pixman?= no 13CHECK_BUILTIN.pixman?= no
14.if ${CHECK_BUILTIN.pixman:M[nN][oO]} && \ 14.if ${CHECK_BUILTIN.pixman:tl} == no && \
15 ${USE_BUILTIN.pixman:M[Yy][Ee][Ss]} && \ 15 ${USE_BUILTIN.pixman:tl} == yes && \
16 !empty(MACHINE_PLATFORM:MDarwin-9.*-*) 16 ${MACHINE_PLATFORM:MDarwin-9.*-*}
17BUILDLINK_TRANSFORM+= opt:-lpixman-1.0.10.0:-lpixman-1 17BUILDLINK_TRANSFORM+= opt:-lpixman-1.0.10.0:-lpixman-1
18.endif 18.endif
cvs diff -r1.14 -r1.15 pkgsrc/x11/pixman/hacks.mk (expand / switch to unified diff)

--- 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,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: hacks.mk,v 1.14 2022/05/24 09:55:02 nia Exp $ 1# $NetBSD: hacks.mk,v 1.15 2023/09/29 09:27:07 adam Exp $
2# 2#
3.if !defined(PIXMAN_HACKS_MK) 3.if !defined(PIXMAN_HACKS_MK)
4PIXMAN_HACKS_MK= # empty 4PIXMAN_HACKS_MK= # empty
5.include "../../mk/bsd.fast.prefs.mk" 5.include "../../mk/bsd.fast.prefs.mk"
6.include "../../mk/compiler.mk" 6.include "../../mk/compiler.mk"
7### 7###
8### XXX SSE2 intrinsics require gcc-4.2+ to build. 8### XXX SSE2 intrinsics require gcc-4.2+ to build.
9### XXX Need to disable SSSE3 explicitly, too. 9### XXX Need to disable SSSE3 explicitly, too.
10### 10###
11.if empty(CC_VERSION:Mgcc-4.[2-9]*) && \ 11. if !${CC_VERSION:Mgcc-4.[2-9]*} && \
12 empty(CC_VERSION:Mgcc-[5-9].*) && \ 12 !${CC_VERSION:Mgcc-[5-9].*} && \
13 empty(CC_VERSION:Mgcc-[1-9][0-9]*) 13 !${CC_VERSION:Mgcc-[1-9][0-9]*}
14CONFIGURE_ARGS+= --disable-sse2 --disable-ssse3 14CONFIGURE_ARGS+= --disable-sse2 --disable-ssse3
15.endif 15. endif
16.endif 16.endif
17 17
18.if !empty(PKGSRC_COMPILER:Msunpro) 18.if !empty(PKGSRC_COMPILER:Msunpro)
19CONFIGURE_ARGS+= --disable-sse2 --disable-mmx --disable-ssse3 19CONFIGURE_ARGS+= --disable-sse2 --disable-mmx --disable-ssse3
20.endif 20.endif
21 21
22CONFIGURE_ARGS.MirBSD+= PTHREAD_LIBS=-pthread 22CONFIGURE_ARGS.MirBSD+= PTHREAD_LIBS=-pthread
23 23
24.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 060000 24.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 060000
25CONFIGURE_ENV+= ac_cv_tls=none 25CONFIGURE_ENV+= ac_cv_tls=none
26CFLAGS+= -DPIXMAN_NO_TLS 26CFLAGS+= -DPIXMAN_NO_TLS
27.endif 27.endif