This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch release/6.1
in repository ffmpeg.

commit 89d4bac339d9f359778cd3e406aeb461b551dabc
Author:     Marvin Scholz <[email protected]>
AuthorDate: Wed Sep 11 23:09:34 2024 +0200
Commit:     Michael Niedermayer <[email protected]>
CommitDate: Sat Jun 20 17:42:28 2026 +0200

    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.
    
    (cherry picked from commit 910bf33879ecdf654cdc6342564f7791e34a27bc)
    Signed-off-by: Michael Niedermayer <[email protected]>
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index ccbb7d72ec..40fa7693d8 100755
--- a/configure
+++ b/configure
@@ -5989,9 +5989,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 '"" ::'
 
 for restrict_keyword in restrict __restrict__ __restrict ""; do

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to