Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits: 5580d285 by Hugo Beauzée-Luyssen at 2021-08-04T16:52:09+02:00 extras: tools: Only patch libtool's ltmain.in Instead of ltmain.sh, in order to ensure all changes will used. If ltmain.sh gets modified as well, there is no way to guarantee that all changes to the .in file will trigger a regenetation since both file will likely have the same modification timestamps Refs !182 An updated version of our current libtool patchset has been pushed to https://github.com/chouquette/libtool/tree/vlc_patches - - - - - 3 changed files: - extras/tools/libtool-2.4.6-bitcode.patch - extras/tools/libtool-2.4.6-response-files.patch - extras/tools/libtool-2.4.6-san.patch Changes: ===================================== extras/tools/libtool-2.4.6-bitcode.patch ===================================== @@ -17,22 +17,3 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ---- libtool-2.4.6/build-aux/ltmain.sh.orig 2019-03-06 17:18:05.690203200 +0100 -+++ libtool-2.4.6/build-aux/ltmain.sh 2019-03-06 17:21:40.825606300 +0100 -@@ -10208,16 +10208,6 @@ - - case $host in - *-*-darwin*) -- # Don't allow lazy linking, it breaks C++ global constructors -- # But is supposedly fixed on 10.4 or later (yay!). -- if test CXX = "$tagname"; then -- case ${MACOSX_DEPLOYMENT_TARGET-10.0} in -- 10.[0123]) -- func_append compile_command " $wl-bind_at_load" -- func_append finalize_command " $wl-bind_at_load" -- ;; -- esac -- fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ===================================== extras/tools/libtool-2.4.6-response-files.patch ===================================== @@ -8,14 +8,14 @@ lld (impersonating GNU ld) only supports response files, not linker scripts. Using a linker script as input just to pass a list of files is overkill for cases when a response file is enough. --- - libtool-2.4.6/config/ltmain.m4sh | 28 ++++++++++++++-------------- + libtool-2.4.6/build-aux/ltmain.in | 28 ++++++++++++++-------------- libtool-2.4.6/m4/libtool.m4 | 2 ++ 2 files changed, 16 insertions(+), 14 deletions(-) -diff --git libtool-2.4.6/build-aux/ltmain.sh.orig libtool-2.4.6/build-aux/ltmain.sh +diff --git libtool-2.4.6/build-aux/ltmain.in.orig libtool-2.4.6/build-aux/ltmain.in index 2641327..f6b4217 100644 ---- libtool-2.4.6/build-aux/ltmain.sh.orig 2019-05-14 15:41:21.977391100 +0200 -+++ libtool-2.4.6/build-aux/ltmain.sh 2019-05-14 15:43:07.767697900 +0200 +--- libtool-2.4.6/build-aux/ltmain.in.orig 2019-05-14 15:41:21.977391100 +0200 ++++ libtool-2.4.6/build-aux/ltmain.in 2019-05-14 15:43:07.767697900 +0200 @@ -9852,20 +9852,7 @@ EOF last_robj= k=1 ===================================== extras/tools/libtool-2.4.6-san.patch ===================================== @@ -26,17 +26,3 @@ Copyright-paperwork-exempt: Yes func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" ---- libtool-2.4.6/build-aux/ltmain.sh.orig 2019-03-06 17:25:38.610781500 +0100 -+++ libtool-2.4.6/build-aux/ltmain.sh 2019-03-06 17:26:53.790387700 +0100 -@@ -7273,9 +7273,10 @@ - # --sysroot=* for sysroot support - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -stdlib=* select c++ std lib with clang -+ # -fsanitize=* Clang/GCC memory and address sanitizer - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fsanitize=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5580d2857f2a63fc95e038b59dfb4b012b2013ab -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5580d2857f2a63fc95e038b59dfb4b012b2013ab You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
