Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/libtool: refresh patches

Browse source 
Preparation for bumping libtool several versions at once,
which includes some complex changes to patches.

Remove an empty line change from a patch.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
This commit is contained in:
Michael Pratt 2023-03-09 08:29:38 -05:00 committed by Hauke Mehrtens
parent f509935fe3
commit c7828a7184
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/libtool/patches/000-relocatable.patch
View file

@ -104,18 +104,16 @@
configure_ac=configure.in configure_ac=configure.in
--- a/libltdl/m4/libtool.m4 --- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4
@@ -907,9 +907,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], []) @@ -909,7 +909,7 @@ m4_defun([_LT_TAG_COMPILER],
# ----------------
m4_defun([_LT_TAG_COMPILER],
[AC_REQUIRE([AC_PROG_CC])dnl [AC_REQUIRE([AC_PROG_CC])dnl
-
_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/include"], [LTCC compiler flags])dnl +_LT_DECL([LTCFLAGS], [CFLAGS], ["-O2 -I\${STAGING_DIR_HOST:-$STAGING_DIR_HOST}/include"], [LTCC compiler flags])dnl
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
@@ -7660,9 +7659,9 @@ m4_defun([_LT_DECL_EGREP], @@ -7660,9 +7660,9 @@ m4_defun([_LT_DECL_EGREP],
[AC_REQUIRE([AC_PROG_EGREP])dnl [AC_REQUIRE([AC_PROG_EGREP])dnl
AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([AC_PROG_FGREP])dnl
test -z "$GREP" && GREP=grep test -z "$GREP" && GREP=grep
@ -128,7 +126,7 @@
dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
AC_SUBST([GREP]) AC_SUBST([GREP])
]) ])
@@ -7695,9 +7694,8 @@ AC_SUBST([DLLTOOL]) @@ -7695,9 +7695,8 @@ AC_SUBST([DLLTOOL])
# as few characters as possible. Prefer GNU sed if found. # as few characters as possible. Prefer GNU sed if found.
m4_defun([_LT_DECL_SED], m4_defun([_LT_DECL_SED],
[AC_PROG_SED [AC_PROG_SED

2
tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
View file

@ -1,6 +1,6 @@
--- a/libltdl/config/ltmain.m4sh --- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh
@@ -2183,6 +2183,9 @@ func_mode_install () @@ -2186,6 +2186,9 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi fi

7
tools/libtool/patches/160-passthrough-ssp.patch
View file

@ -1,7 +1,6 @@
diff -ur libtool-2.4.orig/libltdl/config/ltmain.m4sh libtool-2.4/libltdl/config/ltmain.m4sh --- a/libltdl/config/ltmain.m4sh
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2015-06-18 10:46:15.499996979 +0200 +++ b/libltdl/config/ltmain.m4sh
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2015-06-18 10:48:24.686882213 +0200 @@ -5076,7 +5076,7 @@ func_mode_link ()
@@ -5076,7 +5076,7 @@
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -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=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \