diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2020-08-01 23:44:06 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2020-08-01 23:44:06 +0000 |
| commit | 2c04c63b4dbd2b302378ca578bbfb9e56e7bd810 (patch) | |
| tree | 1bc0a7e28716581b88ba646a825e9c6700f519f4 /audio | |
| parent | f1a801871256e3bcc33fb469e3574c286ccb9c30 (diff) | |
| download | pkgsrc-2c04c63b4dbd2b302378ca578bbfb9e56e7bd810.tar.gz | |
Don't set PKG_SUGGESTED_OPTIONS=mpg123-with-fpu on softfloat arm.
Fixes PR/54779.
Bump PKGREVISION to rebuild arm binaries.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mpg123/Makefile | 3 | ||||
| -rw-r--r-- | audio/mpg123/options.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 923df16131d..fb5db13a8ba 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2019/07/27 15:14:40 nia Exp $ +# $NetBSD: Makefile,v 1.59 2020/08/01 23:44:06 tsutsui Exp $ PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//} +PKGREVISION= 1 COMMENT= MPEG layer 1, 2, and 3 audio player PKGCONFIG_OVERRIDE+= libmpg123.pc.in diff --git a/audio/mpg123/options.mk b/audio/mpg123/options.mk index b14ab585a8f..11c2b6d28d5 100644 --- a/audio/mpg123/options.mk +++ b/audio/mpg123/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2018/07/14 17:12:56 tsutsui Exp $ +# $NetBSD: options.mk,v 1.6 2020/08/01 23:44:06 tsutsui Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mpg123 PKG_OPTIONS_OPTIONAL_GROUPS= fpu @@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+= mpg123-x86-dither PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu PKG_SUGGESTED_OPTIONS+= mpg123-with-fpu . endif -.elif (${MACHINE_ARCH} == "arm") || (${MACHINE_ARCH} == "arm32") +.elif !empty(MACHINE_ARCH:M*arm*) && empty(MACHINE_ARCH:M*hf*) PKG_OPTIONS_GROUP.fpu= mpg123-with-fpu .elif (${MACHINE_ARCH} == "aarch64") PKG_OPTIONS_GROUP.fpu= mpg123-neon64 mpg123-aarch64 |