multimedia/ffmpeg5: Move cross-build stuff to Makefile.common. ffplay5 cross-build needs this too.diff -r1.29 -r1.30 pkgsrc/multimedia/ffmpeg5/Makefile
(riastradh)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/01/26 03:17:07 riastradh Exp $
+# $NetBSD: Makefile,v 1.30 2024/01/26 03:17:31 riastradh Exp $
PKGNAME= ${DISTNAME:S/ffmpeg/ffmpeg5/}
PKGREVISION= 1
@@ -16,17 +16,6 @@
.if ${_USE_RPATH:tl} != "no"
CONFIGURE_ARGS+= --enable-rpath
-.endif
-
-.if ${USE_CROSS_COMPILE:U:tl} == yes
-CONFIGURE_ARGS+= --enable-cross-compile
-CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q}
-CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
-CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS}
-. include "../../mk/endian.mk"
-. if ${MACHINE_ENDIAN} == "big"
-CONFIGURE_ENV+= bigendian=yes
-. endif
.endif
PRINT_PLIST_AWK+= /html/ { $$0 = "$${PLIST.doc}" $$0 }
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2023/11/13 15:40:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2024/01/26 03:17:31 riastradh Exp $
# used by multimedia/ffmpeg5/Makefile
# used by multimedia/ffplay5/Makefile
@@ -33,6 +33,17 @@
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/ffmpeg5
CONFIGURE_ARGS+= --shlibdir=${PREFIX}/lib/ffmpeg5
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/ffmpeg5
+
+.if ${USE_CROSS_COMPILE:U:tl} == yes
+CONFIGURE_ARGS+= --enable-cross-compile
+CONFIGURE_ARGS+= --host-cc=${NATIVE_CC:Q}
+CONFIGURE_ARGS+= --host-ld=${NATIVE_CC:Q}
+CONFIGURE_ARGS+= --target-os=${LOWER_OPSYS:Q}
+. include "../../mk/endian.mk"
+. if ${MACHINE_ENDIAN} == "big"
+CONFIGURE_ENV+= bigendian=yes
+. endif
+.endif
.if !empty(MACHINE_PLATFORM:MDarwin-1[2-9].*-*) || !empty(MACHINE_PLATFORM:MDarwin-2*)
CONFIGURE_ARGS+= --enable-opencl