[vlc-commits] [Git][videolan/vlc][master] 3 commits: extras/tools: bump libtool to 2.4.7

Jean-Baptiste Kempf (@jbk) gitlab at videolan.org
Mon Apr 25 18:06:29 UTC 2022 


Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
327a0702 by Alexandre Janniaux at 2022-04-25T17:23:59+00:00
extras/tools: bump libtool to 2.4.7

The -fsanitize support has been added upstream in the commit
a5c6466528c060cc4660ad0319c00740db0e42ba which is shipped into 2.4.7.

- - - - -
c2692090 by Alexandre Janniaux at 2022-04-25T17:23:59+00:00
extras/tools: libtool: rename/cleanup patches

libtool-2.4.6-san.patch is not used anymore, and other libtool patches
have been rebased on top of libtool-2.4.7.

- - - - -
5b4e2add by Alexandre Janniaux at 2022-04-25T17:23:59+00:00
Makefile.am: dist missing libtool patch

The patches were not added to the list of patches to be supplied with a
make dist so were missing in the final archive.

- - - - -


10 changed files:

- Makefile.am
- extras/tools/SHA512SUMS
- − extras/tools/libtool-2.4.6-san.patch
- extras/tools/libtool-2.4.6-bitcode.patch → extras/tools/libtool-2.4.7-bitcode.patch
- extras/tools/libtool-2.4.6-clang-libs.patch → extras/tools/libtool-2.4.7-clang-libs.patch
- extras/tools/libtool-2.4.6-embed-bitcode.patch → extras/tools/libtool-2.4.7-embed-bitcode.patch
- extras/tools/libtool-2.4.6-lpthread.patch → extras/tools/libtool-2.4.7-lpthread.patch
- extras/tools/libtool-2.4.6-response-files.patch → extras/tools/libtool-2.4.7-response-files.patch
- extras/tools/packages.mak
- extras/tools/tools.mak


Changes:

=====================================
Makefile.am
=====================================
@@ -66,10 +66,11 @@ EXTRA_DIST += \
 	extras/tools/bison-macOS-7df04f9.patch \
 	extras/tools/bison-macOS-c41f233c.patch \
 	extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \
-	extras/tools/libtool-2.4.6-bitcode.patch \
-	extras/tools/libtool-2.4.6-clang-libs.patch \
-	extras/tools/libtool-2.4.6-response-files.patch \
-	extras/tools/libtool-2.4.6-san.patch \
+	extras/tools/libtool-2.4.7-bitcode.patch \
+	extras/tools/libtool-2.4.7-clang-libs.patch \
+	extras/tools/libtool-2.4.7-response-files.patch \
+	extras/tools/libtool-2.4.7-lpthread.patch \
+	extras/tools/libtool-2.4.7-embed-bitcode.patch \
 	extras/tools/ragel-6.8-javacodegen.patch
 
 ###############################################################################


=====================================
extras/tools/SHA512SUMS
=====================================
@@ -19,3 +19,4 @@ d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b
 8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd  nasm-2.14.tar.gz
 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514  meson-0.56.2.tar.gz
+27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz


=====================================
extras/tools/libtool-2.4.6-san.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at macports.org>
-Date: Sun, 18 Oct 2015 21:55:39 -0700
-Subject: libtool: fix GCC/clang linking with -fsanitize=*
-
-References:
-https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html
-
-* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the
-linker to allow trivial use of the clang address sanitizer.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at macports.org>
-Copyright-paperwork-exempt: Yes
----
---- libtool-2.4.6/build-aux/ltmain.in.orig	2019-03-06 17:24:29.400776100 +0100
-+++ libtool-2.4.6/build-aux/ltmain.in	2019-03-06 17:26:31.994381100 +0100
-@@ -5361,9 +5361,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"


=====================================
extras/tools/libtool-2.4.6-bitcode.patch → extras/tools/libtool-2.4.7-bitcode.patch
=====================================


=====================================
extras/tools/libtool-2.4.6-clang-libs.patch → extras/tools/libtool-2.4.7-clang-libs.patch
=====================================


=====================================
extras/tools/libtool-2.4.6-embed-bitcode.patch → extras/tools/libtool-2.4.7-embed-bitcode.patch
=====================================
@@ -1,46 +1,41 @@
-From 23f7d7c98d923bd454c114ea7dfa6ded9ef49bbe Mon Sep 17 00:00:00 2001
+From 019e9ec253a972fd5b0e3675140256b0982ec6f4 Mon Sep 17 00:00:00 2001
 From: Alexandre Janniaux <ajanni at videolabs.io>
 Date: Mon, 31 May 2021 10:28:54 +0200
 Subject: [PATCH] ltmain: add support for -fembed-bitcode
 
 ---
- build-aux/ltmain.in | 8 ++++++++
+ build-aux/ltmain.in | 1 +
  m4/libtool.m4       | 4 ++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 96b37003..0d9f10a0 100644
+index 8ef537c1..d8131598 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -5173,6 +5173,13 @@ func_mode_link ()
- 	prev=xcompiler
+@@ -5197,6 +5197,7 @@ func_mode_link ()
  	continue
  	;;
-+      -fembed-bitcode|-fembed-bitcode-marker)
-+	func_append compiler_flags " $arg"
-+	func_append compile_command " $arg"
-+	func_append finalize_command " $arg"
-+	func_append linker_flags " $arg"
-+        continue
-+        ;;
-
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
++      |-fembed-bitcode|-fembed-bitcode-marker \
        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	func_append compiler_flags " $arg"
+ 	func_append compile_command " $arg"
 diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index f2d1f398..e5891815 100644
+index 69cd577d..da0eec54 100644
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -1125,9 +1125,9 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1122,9 +1122,9 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
      _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
 -    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
 +    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
-     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
--    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+     _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+-    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
      m4_if([$1], [CXX],
  [   if test yes != "$lt_cv_apple_cc_single_mod"; then
        _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
---
-2.31.1
+-- 
+2.36.0
+


=====================================
extras/tools/libtool-2.4.6-lpthread.patch → extras/tools/libtool-2.4.7-lpthread.patch
=====================================


=====================================
extras/tools/libtool-2.4.6-response-files.patch → extras/tools/libtool-2.4.7-response-files.patch
=====================================


=====================================
extras/tools/packages.mak
=====================================
@@ -9,7 +9,7 @@ NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_V
 CMAKE_VERSION=3.17.0
 CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
 
-LIBTOOL_VERSION=2.4.6
+LIBTOOL_VERSION=2.4.7
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 
 AUTOCONF_VERSION=2.69


=====================================
extras/tools/tools.mak
=====================================
@@ -112,12 +112,11 @@ libtool-$(LIBTOOL_VERSION).tar.gz:
 libtool: libtool-$(LIBTOOL_VERSION).tar.gz
 	$(UNPACK)
 	(cd $(UNPACK_DIR) && chmod u+w build-aux/ltmain.sh)
-	$(APPLY) $(TOOLS)/libtool-2.4.6-bitcode.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-san.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-clang-libs.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-response-files.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-lpthread.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-embed-bitcode.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-bitcode.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-clang-libs.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-response-files.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-lpthread.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-embed-bitcode.patch
 	$(MOVE)
 
 .buildlibtool: libtool .automake .help2man



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/803ba0d8ed7e112b74cd1521c9b32e9ccec76101...5b4e2addae1184228c08807ad2593c0ea946bd47

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/803ba0d8ed7e112b74cd1521c9b32e9ccec76101...5b4e2addae1184228c08807ad2593c0ea946bd47
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance

More information about the vlc-commits mailing list