diff options
| author | sevan <sevan@pkgsrc.org> | 2017-12-01 21:43:15 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2017-12-01 21:43:15 +0000 |
| commit | 39c4f906e63d2471aa044331f2a439118bd543b0 (patch) | |
| tree | 0461f0c472b3b049a0eafa9e20dda201544f5cf1 /multimedia/ffmpeg3 | |
| parent | 35f0ed9e8d47af7c24930debaeaf6d3609edf635 (diff) | |
| download | pkgsrc-39c4f906e63d2471aa044331f2a439118bd543b0.tar.gz | |
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.
Diffstat (limited to 'multimedia/ffmpeg3')
| -rw-r--r-- | multimedia/ffmpeg3/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile index ec5ca51d667..4cccbaf3083 100644 --- a/multimedia/ffmpeg3/Makefile +++ b/multimedia/ffmpeg3/Makefile @@ -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 @@ -19,7 +19,6 @@ CONF_FILES+= ${PREFIX}/share/examples/ffmpeg3/ffserver.conf \ .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-stack-boundary=4 . 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" |