CVS commit: pkgsrc/multimedia/ffmpeg3

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Fri Dec  1 21:43:15 UTC 2017

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile

Log Message:
the bespoke configure script uses uname -m to detect arch, as opposed to uname -p in
GNU/configure. This results in NetBSD/macppc not being detected as a powerpc
system correctly.
Always specify the arch rather than when we're just cross-compiling.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/multimedia/ffmpeg3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/Makefile
diff -u pkgsrc/multimedia/ffmpeg3/Makefile:1.24 pkgsrc/multimedia/ffmpeg3/Makefile:1.25
--- pkgsrc/multimedia/ffmpeg3/Makefile:1.24     Sun Jul 30 05:21:15 2017
+++ pkgsrc/multimedia/ffmpeg3/Makefile  Fri Dec  1 21:43:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/07/30 05:21:15 adam Exp $
+# $NetBSD: Makefile,v 1.25 2017/12/01 21:43:15 sevan Exp $
 
 PKGNAME=       ${DISTNAME:S/ffmpeg/ffmpeg3/}
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -19,7 +19,6 @@ CONF_FILES+=  ${PREFIX}/share/examples/ff
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 CONFIGURE_ARGS+=       --enable-cross-compile
-CONFIGURE_ARGS+=       --arch=${MACHINE_ARCH}
 CONFIGURE_ARGS+=       --host-cc=${NATIVE_CC:Q}
 CONFIGURE_ARGS+=       --host-ld=${NATIVE_CC:Q}
 CONFIGURE_ARGS+=       --target-os=${LOWER_OPSYS}
@@ -53,4 +52,8 @@ CFLAGS+=              -mstackrealign -mpreferred-sta
 .  endif
 .endif
 
+# configure script uses uname -m to detect arch, as opposed to uname -p in
+# GNU/configure. Unable to detect NetBSD/macppc hosts correctly.
+CONFIGURE_ARGS+=       --arch=${MACHINE_ARCH}
+
 .include "../../multimedia/ffmpeg3/Makefile.common"