[pkgsrc/trunk]: pkgsrc/multimedia ffmpeg: Simplify testing for i386.

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3e593456c9d
branches:  trunk
changeset: 459541:d3e593456c9d
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat Oct 09 07:48:06 2021 +0000

description:
ffmpeg: Simplify testing for i386.

diffstat:

 multimedia/ffmpeg2/Makefile |  15 ++-------------
 multimedia/ffmpeg3/Makefile |  13 ++-----------
 multimedia/ffmpeg4/Makefile |  13 ++-----------
 3 files changed, 6 insertions(+), 35 deletions(-)

diffs (89 lines):

diff -r 299b73cae073 -r d3e593456c9d multimedia/ffmpeg2/Makefile
--- a/multimedia/ffmpeg2/Makefile       Sat Oct 09 07:46:41 2021 +0000
+++ b/multimedia/ffmpeg2/Makefile       Sat Oct 09 07:48:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.76 2021/10/09 07:48:06 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg2/}
 PKGREVISION=   12
@@ -43,20 +43,9 @@
 
 .include "options.mk"
 
-.include "../../mk/compiler.mk"
-
-# disable asm on i386 for non-gcc and gcc < 4.2
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       --disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
-.  endif
-NOT_PAX_MPROTECT_SAFE+=        bin/ffmpeg2
 .endif
 
 .include "../../multimedia/ffmpeg2/Makefile.common"
diff -r 299b73cae073 -r d3e593456c9d multimedia/ffmpeg3/Makefile
--- a/multimedia/ffmpeg3/Makefile       Sat Oct 09 07:46:41 2021 +0000
+++ b/multimedia/ffmpeg3/Makefile       Sat Oct 09 07:48:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.73 2021/10/09 07:48:07 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
 PKGREVISION=   14
@@ -41,18 +41,9 @@
 
 .include "../../mk/compiler.mk"
 
-# disable asm on i386 for non-gcc and gcc < 4.2, or to avoid text relocations
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       --disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
-.  endif
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in
diff -r 299b73cae073 -r d3e593456c9d multimedia/ffmpeg4/Makefile
--- a/multimedia/ffmpeg4/Makefile       Sat Oct 09 07:46:41 2021 +0000
+++ b/multimedia/ffmpeg4/Makefile       Sat Oct 09 07:48:06 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/09/29 19:01:02 adam Exp $
+# $NetBSD: Makefile,v 1.56 2021/10/09 07:48:07 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg4/}
 PKGREVISION=   9
@@ -36,18 +36,9 @@
 
 .include "../../mk/compiler.mk"
 
-# disable asm on i386 for non-gcc and gcc < 4.2
+# disable asm on i386 to avoid text relocations
 .if ${MACHINE_ARCH} == "i386"
-.  if !empty(MACHINE_PLATFORM:MDarwin-*-i386) \
-   || !empty(MACHINE_PLATFORM:MSunOS-*-i386) \
-   || !empty(MACHINE_PLATFORM:MNetBSD-*-i386) \
-   || !empty(CC_VERSION:Mgcc-[123]*) \
-   || !empty(CC_VERSION:Mgcc-4.[01].*) \
-   || empty(CC_VERSION:Mgcc*)
 CONFIGURE_ARGS+=       --disable-asm
-.  elif !empty(CC_VERSION:Mgcc-[456].*)
-CFLAGS+=               -mstackrealign -mpreferred-stack-boundary=4
-.  endif
 .endif
 
 # configure script uses uname -m to detect arch, as opposed to uname -p in