vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Wed Sep 30 22:07:33 2015 +0200| [7507d0cf583c383c854f1ecab5216b37f82d4266] | committer: Felix Paul Kühne
extras/tools/libtool: remove crude hack for legacy OS X platforms > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7507d0cf583c383c854f1ecab5216b37f82d4266 --- extras/tools/libtool-2.4.2-bitcode.patch | 40 ++++++++++++++++++++++++++++++ extras/tools/tools.mak | 1 + 2 files changed, 41 insertions(+) diff --git a/extras/tools/libtool-2.4.2-bitcode.patch b/extras/tools/libtool-2.4.2-bitcode.patch new file mode 100644 index 0000000..deba555 --- /dev/null +++ b/extras/tools/libtool-2.4.2-bitcode.patch @@ -0,0 +1,40 @@ +diff -ru libtool/libltdl/config/ltmain.m4sh libtool-fixed/libltdl/config/ltmain.m4sh +--- libtool/libltdl/config/ltmain.m4sh 2011-10-17 12:17:05.000000000 +0200 ++++ libtool-fixed/libltdl/config/ltmain.m4sh 2015-09-30 22:03:22.000000000 +0200 +@@ -7928,16 +7928,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 "$tagname" = CXX ; 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'` +diff -ru libtool/libltdl/config/ltmain.sh libtool-fixed/libltdl/config/ltmain.sh +--- libtool/libltdl/config/ltmain.sh 2011-10-17 12:19:35.000000000 +0200 ++++ libtool-fixed/libltdl/config/ltmain.sh 2015-09-30 22:03:44.000000000 +0200 +@@ -8715,16 +8715,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 "$tagname" = CXX ; 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'` diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index aac8a52..69a8d2d 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -82,6 +82,7 @@ libtool-$(LIBTOOL_VERSION).tar.gz: libtool: libtool-$(LIBTOOL_VERSION).tar.gz $(UNPACK) + $(APPLY) libtool-2.4.2-bitcode.patch $(MOVE) .libtool: libtool .automake _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
