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.
This commit is contained in:
Alexandre Janniaux 2022-04-20 18:10:17 +02:00 committed by Jean-Baptiste Kempf
parent 327a070266
commit c269209097
8 changed files with 8 additions and 36 deletions

View File

@ -66,9 +66,9 @@ 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.7-bitcode.patch \
extras/tools/libtool-2.4.7-clang-libs.patch \
extras/tools/libtool-2.4.7-response-files.patch \
extras/tools/ragel-6.8-javacodegen.patch
###############################################################################

View File

@ -1,28 +0,0 @@
From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@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@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"

View File

@ -112,11 +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-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