Skip to content

Commit

Permalink
libtool: update to 2.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ikspress committed Sep 12, 2024
1 parent 2368d50 commit 4aa116f
Show file tree
Hide file tree
Showing 14 changed files with 627 additions and 1,633 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[PATCH 2/6] [cygwin|mingw] Create UAC manifest files.
[PATCH] [cygwin|mingw] Create UAC manifest files.

* build-aux/ltmain.in (func_emit_exe_manifest): New function.
(func_mode_link) [cygwin|mingw]: Create manifest files for wrapper
Expand All @@ -8,14 +8,14 @@ error. Ensure manifest files have executable permission.
(func_mode_uninstall): Clean up manifest files.
Various reports by Eric Blake, Kai Tietz, and Cesar Strauss.
---
build-auxltmain.in | 50 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 2 deletions(-)
build-aux/ltmain.in | 50 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0418007..1821779 100644
index fb43fef0..ac20e68c 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -4277,6 +4277,41 @@ EOF
@@ -4572,6 +4572,41 @@ EOF
}
# end: func_emit_cwrapperexe_src

Expand Down Expand Up @@ -57,16 +57,16 @@ index 0418007..1821779 100644
# func_win32_import_lib_p ARG
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
@@ -8237,7 +8272,7 @@ EOF
cwrappersource="$output_path/$objdir/lt-$output_name.c"
cwrapper="$output_path/$output_name.exe"
@@ -8610,7 +8645,7 @@ func_mode_link ()
cwrappersource=$output_path/$objdir/lt-$output_name.c
cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
- trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ trap "$RM $cwrappersource $cwrapper $cwrapper.manifest; exit $EXIT_FAILURE" 1 2 15

func_emit_cwrapperexe_src > $cwrappersource

@@ -8257,6 +8292,16 @@ EOF
@@ -8630,6 +8665,16 @@ func_mode_link ()
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
if test "x$build" = "x$host"; then
Expand All @@ -83,7 +83,7 @@ index 0418007..1821779 100644
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -8777,8 +8822,9 @@ func_mode_uninstall ()
@@ -9156,8 +9201,9 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
func_append rmfiles " $odir/$name $odir/${name}S.$objext"
Expand All @@ -94,6 +94,3 @@ index 0418007..1821779 100644
fi
if test "X$noexename" != "X$name"; then
func_append rmfiles " $odir/lt-$noexename.c"
--
1.7.1

Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[PATCH 5/6] Fix "seems to be moved"
[PATCH] Fix "seems to be moved"

* build-aux/ltmain.in (func_mode_link): Compare files by inode
to fix "seems to be moved" warning.
---
build-aux/ltmain.in | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
build-aux/ltmain.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index af46cb8..244bb5b 100644
index ac20e68c..d9978a7c 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -6283,7 +6283,9 @@ func_mode_link ()
@@ -6734,7 +6734,9 @@ func_mode_link ()
eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
func_fatal_error "'$deplib' is not a valid libtool archive"
Expand All @@ -20,5 +21,3 @@ index af46cb8..244bb5b 100644
func_warning "'$deplib' seems to be moved"

path=-L$absdir
--
1.7.0.2.msysgit.0
27 changes: 0 additions & 27 deletions libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch

This file was deleted.

18 changes: 18 additions & 0 deletions libtool/0005-libtool-include-process.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[PATCH] libtool: include process.h

---
build-aux/ltmain.in | 1 +
1 file changed, 1 insertion(+)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 740539e8..0cead487 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -3654,6 +3654,7 @@ EOF
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
+# include <process.h>
# include <io.h>
# endif
#endif
22 changes: 0 additions & 22 deletions libtool/0006-Fix-strict-ansi-vs-posix.patch

This file was deleted.

Loading

0 comments on commit 4aa116f

Please sign in to comment.