kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ffmpeg: Simplify testing for i386.

Browse source
This commit is contained in:
nia 2021-10-09 07:48:06 +00:00
parent 340fb58b93
commit 5b8e77b7d3
3 changed files with 6 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
multimedia/ffmpeg2/Makefile
View file

@ -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 @@ post-install:
.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"

13
multimedia/ffmpeg3/Makefile
View file

@ -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 @@ post-install:
.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

13
multimedia/ffmpeg4/Makefile
View file

@ -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 @@ post-install:
.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