[SCM] libav/experimental: configure: require --arch and --target-os when cross-compiling
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:59:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 8d4c00ed3867a01d75a4361049974b84ec574fde
Author: Måns Rullgård <mans at mansr.com>
Date: Thu Feb 11 23:57:52 2010 +0000
configure: require --arch and --target-os when cross-compiling
Originally committed as revision 21766 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/configure b/configure
index 203146f..e85f6ee 100755
--- a/configure
+++ b/configure
@@ -1427,12 +1427,12 @@ yasmexe="yasm"
nm_opts='-g'
# machine
-arch=$(uname -m)
+arch_default=$(uname -m)
cpu="generic"
# OS
-target_os=$(tolower $(uname -s))
-host_os=$target_os
+target_os_default=$(tolower $(uname -s))
+host_os=$target_os_default
# configurable options
enable avcodec
@@ -1606,6 +1606,13 @@ set >> $logfile
test -n "$cross_prefix" && enable cross_compile
+if enabled cross_compile; then
+ test -n "$arch" && test -n "$target_os" ||
+ die "Must specify target arch and OS when cross-compiling"
+fi
+
+set_default arch target_os
+
ar="${cross_prefix}${ar}"
cc_default="${cross_prefix}${cc_default}"
nm_default="${cross_prefix}${nm_default}"
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list