[FFmpeg-cvslog] configure: fix symbol prefix detection
Marvin Scholz
git at videolan.org
Wed Sep 18 16:35:37 EEST 2024
ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Sep 11 23:09:34 2024 +0200| [910bf33879ecdf654cdc6342564f7791e34a27bc] | committer: Marvin Scholz
configure: fix symbol prefix detection
The symbol prefix check would incorrectly detect a bogus prefix in
circumstances where sanitizers instrument the build, like when
configuring with the clang-asan toolchain where it would detect the
prefix as __odr_asan_gen_, which is obviously wrong.
To fix this, adjust the prefix detection to only detect a
one-character prefix, which is the only case that matters
anywhere right now.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=910bf33879ecdf654cdc6342564f7791e34a27bc
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 8fbf3772a8..2c4b5273b2 100755
--- a/configure
+++ b/configure
@@ -6137,9 +6137,11 @@ enabled pic && enable_weak_pic
test_cc <<EOF || die "Symbol mangling check failed."
int ff_extern;
EOF
-sym=$($nm $TMPO | awk '/ff_extern/{ print substr($0, match($0, /[^ \t]*ff_extern/)) }')
+sym=$($nm $TMPO | awk '/[ \t]+[^ \t]{0,1}ff_extern$/{ print substr($0, match($0, /[^ \t]{0,1}ff_extern$/)) }')
extern_prefix=${sym%%ff_extern*}
+log "Symbol prefix detected as: '${extern_prefix}'"
+
! disabled inline_asm && check_inline_asm inline_asm '"" ::'
check_cc pragma_deprecated "" '_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")'
More information about the ffmpeg-cvslog
mailing list