[FFmpeg-cvslog] Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'
James Almer
git at videolan.org
Mon Nov 6 23:03:10 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Nov 6 17:50:00 2017 -0300| [7a5a1c8c97d6c7db2efe534d17be5f33c1a30adb] | committer: James Almer
Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'
* commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c':
configure: Automatically add -isysroot for darwin if --sysroot is specified
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a5a1c8c97d6c7db2efe534d17be5f33c1a30adb
---
configure | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 1b0f064607..517c8fd466 100755
--- a/configure
+++ b/configure
@@ -4455,9 +4455,6 @@ if test -n "$sysroot"; then
gcc|llvm_gcc|clang)
add_cppflags --sysroot="$sysroot"
add_ldflags --sysroot="$sysroot"
-# On Darwin --sysroot may be ignored, -isysroot always affects headers and linking
- add_cppflags -isysroot "$sysroot"
- add_ldflags -isysroot "$sysroot"
;;
tms470)
add_cppflags -I"$sysinclude"
@@ -5012,6 +5009,10 @@ case $target_os in
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
check_header dispatch/dispatch.h &&
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'
+ if test -n "$sysroot"; then
+ is_in -isysroot $cc $CPPFLAGS $CFLAGS || check_cppflags -isysroot $sysroot
+ is_in -isysroot $ld $LDFLAGS || check_ldflags -isysroot $sysroot
+ fi
version_script='-exported_symbols_list'
VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
;;
======================================================================
diff --cc configure
index 1b0f064607,bbed2258b9..517c8fd466
--- a/configure
+++ b/configure
@@@ -5012,8 -3981,10 +5009,12 @@@ case $target_os i
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
check_header dispatch/dispatch.h &&
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'
+ if test -n "$sysroot"; then
+ is_in -isysroot $cc $CPPFLAGS $CFLAGS || check_cppflags -isysroot $sysroot
+ is_in -isysroot $ld $LDFLAGS || check_ldflags -isysroot $sysroot
+ fi
+ version_script='-exported_symbols_list'
+ VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
;;
msys*)
die "Native MSYS builds are discouraged, please use the MINGW environment."
More information about the ffmpeg-cvslog
mailing list