multimedia/x264-devel configure fails on mips targets

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

Prior to the most recent update of "multimedia/x264-devel", it built on
my Lemote YEELOONG (ebvmips-mips64el, 7.99.2[45]) without problems.  As
of recent pkgsrc-HEAD, it fails during the configure phase with:

[...]
===> Configuring for x264-devel-20151227
=> Adding support for NetBSD.
=> Replacing sh interpreter in strip_fopt.sh version.sh.
You specified a pre-MSA CPU in your CFLAGS.
If you really want to run on such a CPU, configure with --disable-asm.
*** Error code 1

Stop.
make[1]: stopped in /d0/nbsd/pkgsrc/multimedia/x264-devel


The resulting "config.log" reports:

x264 configure script
Command line options: "--enable-pic" "--prefix=/usr/pkg" "--disable-opencl"

checking whether gcc works... yes
checking whether gcc supports for( int i = 0; i < 9; i++ ); with -std=gnu99... yes
checking for -mmsa -mfp64 -mhard-float... no
Failed commandline was:
--------------------------------------------------
gcc conftest.c -O2 -DHAVE_STDLIB_H -I/usr/include -Wall -I. -I$(SRCPATH) -std=gnu99  -mmsa -mfp64 -mhard-float  -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib -lm -o conftest
gcc: error: unrecognized command line option '-mmsa'
--------------------------------------------------
Failed program was:
--------------------------------------------------
int main (void) {  return 0; }
--------------------------------------------------
checking whether gcc supports __asm__("addvi.b $w0, $w1, 1");... no
Failed commandline was:
--------------------------------------------------
gcc conftest.c -O2 -DHAVE_STDLIB_H -I/usr/include -Wall -I. -I$(SRCPATH) -std=gnu99    -L/usr/lib -Wl,-R/usr/lib -Wl,-R/usr/pkg/lib -lm -o conftest
/var/tmp//ccfGRdO2.s: Assembler messages:
/var/tmp//ccfGRdO2.s:20: Error: Unrecognized opcode `addvi.b $w0,$w1,1'
--------------------------------------------------
Failed program was:
--------------------------------------------------
int main (void) { __asm__("addvi.b $w0, $w1, 1"); return 0; }
--------------------------------------------------


Indeed, "-mmsa" is not listed among compiler options for MIPS in the
gcc manual page.

The following patch implements the suggested workaround and it "works
for me":

+Index: multimedia/x264-devel/Makefile
+===================================================================
+RCS file: /cvsroot/pkgsrc/multimedia/x264-devel/Makefile,v
+retrieving revision 1.55
+diff -u -p -r1.55 Makefile
+--- multimedia/x264-devel/Makefile	28 Dec 2015 11:37:03 -0000	1.55
++++ multimedia/x264-devel/Makefile	18 Jan 2016 18:09:16 -0000
+@@ -46,6 +46,9 @@ BUILD_DEPENDS+=		yasm>=0.4.0:../../devel
+ .elif ${MACHINE_ARCH} == "arm" && ${OPSYS} == "NetBSD"
+ # pre-ARMv6 is default on NetBSD/arm
+ CONFIGURE_ARGS+=	--disable-asm
++.elif !empty(MACHINE_ARCH:Mmips*) && ${OPSYS} == "NetBSD"
++# mips{,64}e{b,l}-netbsd-gcc does not support "-mmsa"
++CONFIGURE_ARGS+=	--disable-asm
+ .endif
+ 
+ USE_TOOLS+=		bash gmake

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645