Mon Mar 15 18:25:22 2021 UTC ()
Spell --with-cpu correctly for aarch64 in mpg123's options.mk.


(dholland)
diff -r1.8 -r1.9 pkgsrc/audio/mpg123/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/audio/mpg123/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/options.mk 2020/10/27 08:58:13 1.8
+++ pkgsrc/audio/mpg123/options.mk 2021/03/15 18:25:21 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.8 2020/10/27 08:58:13 nia Exp $ 1# $NetBSD: options.mk,v 1.9 2021/03/15 18:25:21 dholland Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 3PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123
4PKG_OPTIONS_OPTIONAL_GROUPS= fpu 4PKG_OPTIONS_OPTIONAL_GROUPS= fpu
5PKG_SUPPORTED_OPTIONS= mpg123-fifo 5PKG_SUPPORTED_OPTIONS= mpg123-fifo
6PKG_SUGGESTED_OPTIONS+= mpg123-fifo 6PKG_SUGGESTED_OPTIONS+= mpg123-fifo
7PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu 7PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu
8 8
9.include "../../mk/bsd.fast.prefs.mk" 9.include "../../mk/bsd.fast.prefs.mk"
10 10
11.if ${MACHINE_ARCH} == "aarch64" 11.if ${MACHINE_ARCH} == "aarch64"
12PKG_OPTIONS_GROUP.fpu+= mpg123-neon64 mpg123-aarch64 12PKG_OPTIONS_GROUP.fpu+= mpg123-neon64 mpg123-aarch64
13PKG_SUGGESTED_OPTIONS+= mpg123-aarch64 13PKG_SUGGESTED_OPTIONS+= mpg123-aarch64
14.elif ${MACHINE_ARCH} == "powerpc" 14.elif ${MACHINE_ARCH} == "powerpc"
@@ -20,23 +20,23 @@ PKG_SUGGESTED_OPTIONS+= mpg123-altivec @@ -20,23 +20,23 @@ PKG_SUGGESTED_OPTIONS+= mpg123-altivec
20PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu 20PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu
21. endif 21. endif
22.endif 22.endif
23 23
24.include "../../mk/bsd.options.mk" 24.include "../../mk/bsd.options.mk"
25 25
26.if !empty(PKG_OPTIONS:Mmpg123-with-fpu) 26.if !empty(PKG_OPTIONS:Mmpg123-with-fpu)
27CONFIGURE_ARGS+= --with-cpu=generic_fpu 27CONFIGURE_ARGS+= --with-cpu=generic_fpu
28.elif !empty(PKG_OPTIONS:Mmpg123-altivec) 28.elif !empty(PKG_OPTIONS:Mmpg123-altivec)
29CONFIGURE_ARGS+= --with-cpu=altivec 29CONFIGURE_ARGS+= --with-cpu=altivec
30.elif !empty(PKG_OPTIONS:Mmpg123-neon64) 30.elif !empty(PKG_OPTIONS:Mmpg123-neon64)
31CONFIGURE_ARGS+= --with-cpu=neon64 31CONFIGURE_ARGS+= --with-cpu=neon64
32.elif !empty(PKG_OPTIONS:Mmpg123-aarch64) 32.elif !empty(PKG_OPTIONS:Mmpg123-aarch64)
33CONFIGURE_ARGS+= --with-cup=aarch64 33CONFIGURE_ARGS+= --with-cpu=aarch64
34.else 34.else
35CONFIGURE_ARGS+= --with-cpu=generic_nofpu 35CONFIGURE_ARGS+= --with-cpu=generic_nofpu
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mmpg123-fifo) 38.if !empty(PKG_OPTIONS:Mmpg123-fifo)
39CONFIGURE_ARGS+= --enable-fifo=yes 39CONFIGURE_ARGS+= --enable-fifo=yes
40.else 40.else
41CONFIGURE_ARGS+= --enable-fifo=no 41CONFIGURE_ARGS+= --enable-fifo=no
42.endif 42.endif