Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

libtool: update to 2.5.3

Browse Source
This commit is contained in:
Yang Kun 2024-09-12 12:27:25 +08:00
parent 9c9279f9bd
commit c76a013ead
15 changed files with 706 additions and 1573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mingw-w64-libtool/0002-cygwin-mingw-Create-UAC-manifest-files.mingw.patch → mingw-w64-libtool/0001-cygwin-mingw-Create-UAC-manifest-files.patch
View File

@ -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
@ -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 68aca605..8e6bf480 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
@ -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
@ -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"
@ -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

25
mingw-w64-libtool/0001-handle-unset-multilib.patch Normal file
View File

@ -0,0 +1,25 @@
From 0fad3a7164f0e8bbdef93ece8a128f0e1367d4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
Date: Mon, 14 Oct 2024 17:25:07 +0200
Subject: [PATCH] handle unset $multilib
---
m4/libtool.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index e5ddacee..4c44bf9c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2569,7 +2569,7 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
# If user builds GCC with mulitlibs enabled,
# it should just install on $(libdir)
# not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
- if test yes = $multilib; then
+ if test xyes = x$multilib; then
postinstall_cmds='base_file=`basename \$file`~
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
--
2.44.0.windows.1

13
mingw-w64-libtool/0005-Fix-seems-to-be-moved.patch → mingw-w64-libtool/0002-Fix-seems-to-be-moved.patch
View File

@ -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 8e6bf480..3e2adfb1 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"
@ -20,5 +21,3 @@ index af46cb8..244bb5b 100644
func_warning "'$deplib' seems to be moved"
path=-L$absdir
--
1.7.0.2.msysgit.0

15
mingw-w64-libtool/0006-Fix-strict-ansi-vs-posix.patch → mingw-w64-libtool/0003-Fix-STRICT_ANSI-vs-POSIX.patch
View File

@ -1,22 +1,21 @@
[PATCH 6/6] Fix STRICT_ANSI vs POSIX
[PATCH] Fix STRICT_ANSI vs POSIX
* build-aux/ltmain.in (func_mode_link): Also check for _POSIX
as well as __STRICT_ANSI__ to avoid re-definitions.
---
build-aux/ltmain.in | 4 +++-
1 files changed, 1 insertions(+), 1 deletions(-)
build-aux/ltmain.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index af46cb8..244bb5b 100644
index 3e2adfb1..5f9af8c2 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -3382,7 +3382,7 @@
@@ -3670,7 +3670,7 @@ EOF
/* declarations of non-ANSI functions */
#if defined __MINGW32__
-# ifdef __STRICT_ANSI__
+# if defined(__STRICT_ANSI__) && !defined(__MINGW64_VERSION_MAJOR) || defined(_POSIX_)
int _putenv (const char *);
_CRTIMP int __cdecl _putenv (const char *);
# endif
#elif defined __CYGWIN__
--
1.7.0.2.msysgit.0

27
mingw-w64-libtool/0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch
View File

@ -1,27 +0,0 @@
[PATCH 3/6] Pass various runtime library flags to GCC.
* build-aux/ltmain.in (func_mode_link): Pass the
-shared-libgcc and -static-lib* flags along to GCC.
diff -urN libtool-2.4.7/build-aux/ltmain.in.orig libtool-2.4.7/build-aux/ltmain.in
--- libtool-2.4.7/build-aux/ltmain.in.orig 2022-05-25 13:57:50.311734300 +0200
+++ libtool-2.4.7/build-aux/ltmain.in 2022-05-25 14:01:54.621866600 +0200
@@ -5440,13 +5440,18 @@
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
+ # -{shared,static}-libgcc, -static-{libgfortran|libstdc++}
+ # link against specified runtime library
# -fsanitize=* Clang/GCC memory and address sanitizer
# -fuse-ld=* Linker select flags for GCC
# -Wa,* Pass flags directly to the assembler
-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=*| \
- -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
+ -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-ftree-parallelize-loops=*| \
+ -fcilkplus|-fgnu-tm|-ffast-math|-funsafe-math-optimizations| \
+ -fvtable-verify*|-shared-libgcc|-static-libgcc|-static-libgfortran| \
+ -static-libstdc++)
func_quote_arg pretty "$arg"
arg=$func_quote_arg_result
func_append compile_command " $arg"

16
mingw-w64-libtool/0015-Allow-statically-linking-Flang-support-libraries.patch → mingw-w64-libtool/0004-Allow-statically-linking-Flang-support-libraries-whe.patch
View File

@ -1,9 +1,15 @@
Allow statically linking Flang support libraries when linking a library
[PATCH] Allow statically linking Flang support libraries when linking
a library
diff -urN libtool-2.4.7/build-aux/ltmain.in.orig libtool-2.4.7/build-aux/ltmain.in
--- libtool-2.4.7/build-aux/ltmain.in.orig 2022-03-17 03:43:39.000000000 +0100
+++ libtool-2.4.7/build-aux/ltmain.in 2022-10-30 11:49:11.337887100 +0100
@@ -7459,6 +7459,15 @@
---
build-aux/ltmain.in | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 5f9af8c2..97810d08 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -7439,6 +7439,15 @@ func_mode_link ()
a_deplib=
break 2
fi

18
mingw-w64-libtool/0005-libtool-include-process.h.patch Normal file
View File

@ -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 97810d08..e3c77f29 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

29
mingw-w64-libtool/0006-Pass-various-flags-to-GCC.patch Normal file
View File

@ -0,0 +1,29 @@
[PATCH] Pass various flags to GCC
* build-aux/ltmain.in (func_mode_link): Pass various flags to GCC.
See https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#DOCF1
---
build-aux/ltmain.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index e3c77f29..0560159b 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -5460,6 +5460,7 @@ func_mode_link ()
# -static-libsan Link with static sanitizer runtimes (Clang)
# -no-canonical-prefixes Do not expand any symbolic links
# -fuse-ld=* Linker select flags for GCC
+ # -shared-* direct GCC to link specific libraries dynamically
# -static-* direct GCC to link specific libraries statically
# -fcilkplus Cilk Plus language extension features for C/C++
# -rtlib=* select c runtime lib with clang
@@ -5474,6 +5475,7 @@ func_mode_link ()
-specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
-fdiagnostics-color*|-frecord-gcc-switches| \
+ -ffast-math|-fgnu-tm|-ftree-parallelize-loops=*|-funsafe-math-optimizations|-fvtable-verify*|-shared-*| \
-fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*)
func_quote_arg pretty "$arg"
arg=$func_quote_arg_result

22
mingw-w64-libtool/0007-fix-cr-for-awk-in-configure.all.patch
View File

@ -1,22 +0,0 @@
--- libtool-2.4.2/configure.orig 2011-10-17 10:18:58.000000000 +0000
+++ libtool-2.4.2/configure 2013-08-04 19:01:30.220494400 +0000
@@ -28825,7 +28825,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
--- libtool-2.4.2/libltdl/configure.orig 2011-10-17 10:19:47.000000000 +0000
+++ libtool-2.4.2/libltdl/configure 2013-08-05 11:49:24.990792500 +0000
@@ -13574,7 +13574,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi

531
mingw-w64-libtool/0007-msysize.patch Normal file
View File

@ -0,0 +1,531 @@
[PATCH] msysize
---
build-aux/ltmain.in | 50 ++++++++++++++++++++++----------------------
m4/libtool.m4 | 48 +++++++++++++++++++++---------------------
m4/ltargz.m4 | 2 +-
m4/ltdl.m4 | 2 +-
m4/ltoptions.m4 | 2 +-
tests/bindir.at | 4 ++--
tests/bug_62343.at | 2 +-
tests/lt_dladvise.at | 2 +-
8 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0560159b..860c6a09 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -521,7 +521,7 @@ libtool_validate_options ()
case $host_os in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -1543,7 +1543,7 @@ func_mode_compile ()
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
- cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | os2* | cegcc*)
pic_mode=default
;;
esac
@@ -2420,7 +2420,7 @@ func_mode_install ()
'exit $?'
tstripme=$stripme
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
case $realname in
*.dll.a)
tstripme=
@@ -2533,7 +2533,7 @@ func_mode_install ()
# Do a test to see if this is really a libtool program.
case $host in
- *cygwin* | *mingw* | *windows*)
+ *cygwin* | *msys* | *mingw* | *windows*)
if func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
wrapper=$func_ltwrapper_scriptname_result
@@ -2608,7 +2608,7 @@ func_mode_install ()
# remove .exe since cygwin /usr/bin/install will append another
# one anyway
case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
+ */usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
case $file:$destfile in
*.exe:*.exe)
# this is ok
@@ -2761,7 +2761,7 @@ extern \"C\" {
$RM $export_symbols
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
;;
@@ -2773,7 +2773,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
@@ -2787,7 +2787,7 @@ extern \"C\" {
func_basename "$dlprefile"
name=$func_basename_result
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
@@ -2970,7 +2970,7 @@ static const void *lt_preloaded_setup() {
# Transform the symbol file into the correct name.
symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
@@ -3870,7 +3870,7 @@ main (int argc, char *argv[])
{
EOF
case $host in
- *mingw* | *windows* | *cygwin* )
+ *mingw* | *windows* | *cygwin* | *msys* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
;;
@@ -4644,7 +4644,7 @@ func_mode_link ()
$debug_cmd
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
# what system we are compiling for in order to pass an extra
@@ -5152,7 +5152,7 @@ func_mode_link ()
;;
esac
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
@@ -5172,7 +5172,7 @@ func_mode_link ()
-l*)
if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -5267,7 +5267,7 @@ func_mode_link ()
-no-install)
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
func_warning "'-no-install' is ignored for $host"
@@ -6198,7 +6198,7 @@ func_mode_link ()
fi
case $host in
# special handling for platforms with PE-DLLs.
- *cygwin* | *mingw* | *windows* | *cegcc* )
+ *cygwin* | *msys* | *mingw* | *windows* | *cegcc* )
# Linker will automatically link against shared library if both
# static and shared are present. Therefore, ensure we extract
# symbols from the import library if a shared library is present
@@ -6347,7 +6347,7 @@ func_mode_link ()
if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ cygwin* | msys* | mingw* | windows* | cegcc* | os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -6419,7 +6419,7 @@ func_mode_link ()
elif test -n "$soname_spec"; then
# bleh windows
case $host_os in
- cygwin* | mingw* | windows* | cegcc* | os2*)
+ cygwin* | msys* | mingw* | windows* | cegcc* | os2*)
func_arith $current - $age
major=$func_arith_result
versuffix=-$major
@@ -7333,7 +7333,7 @@ func_mode_link ()
if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
# these systems don't actually have a c library (as such)!
;;
*-*-rhapsody* | *-*-darwin1.[012])
@@ -7750,7 +7750,7 @@ func_mode_link ()
orig_export_symbols=
case $host_os in
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
func_dll_def_p "$export_symbols" || {
@@ -8309,7 +8309,7 @@ func_mode_link ()
prog)
case $host in
- *cygwin*) func_stripname '' '.exe' "$output"
+ *cygwin* | *msys*) func_stripname '' '.exe' "$output"
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
@@ -8420,7 +8420,7 @@ func_mode_link ()
esac
fi
case $host in
- *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
@@ -8498,7 +8498,7 @@ func_mode_link ()
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
wrappers_required=false
;;
- *cygwin* | *mingw* | *windows* )
+ *cygwin* | *msys* | *mingw* | *windows* )
test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
@@ -8645,14 +8645,14 @@ func_mode_link ()
esac
# test for cygwin because mv fails w/o .exe extensions
case $host in
- *cygwin*)
+ *cygwin*| *msys*)
exeext=.exe
func_stripname '' '.exe' "$outputname"
outputname=$func_stripname_result ;;
*) exeext= ;;
esac
case $host in
- *cygwin* | *mingw* | windows* )
+ *cygwin* | *msys* | *mingw* | windows* )
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
@@ -8996,7 +8996,7 @@ func_mode_link ()
# tests/bindir.at for full details.
tdlname=$dlname
case $host,$output,$installed,$module,$dlname in
- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+ *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index e5ddacee..93a54713 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1717,7 +1717,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=-1;
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1965,7 +1965,7 @@ else
lt_cv_dlopen_libs=
;;
- cygwin*)
+ cygwin* | msys*)
lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
@@ -2555,7 +2555,7 @@ bsdi[[45]]*)
# libtool to hard-code these into programs
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
version_type=windows
shrext_cmds=.dll
need_version=no
@@ -2595,9 +2595,9 @@ cygwin* | mingw* | windows* | pw32* | cegcc*)
shlibpath_overrides_runpath=yes
case $host_os in
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ cygwin* | msys*)
+ # MSYS DLLs use 'msys-' prefix rather than 'lib'
+ soname_spec='`echo $libname | $SED -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
@@ -2635,7 +2635,7 @@ m4_if([$1], [],[
# Convert to MSYS style.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
;;
- cygwin*)
+ cygwin* | msys*)
# Convert to unix form, then to dos form, then back to unix form
# but this time dos style (no spaces!) so that the unix form looks
# like /cygdrive/c/PROGRA~1:/cygdr...
@@ -3428,7 +3428,7 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
if test yes != "$GCC"; then
reload_cmds=false
fi
@@ -3520,7 +3520,7 @@ bsdi[[45]]*)
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | msys*)
# func_win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
@@ -3833,7 +3833,7 @@ lt_cv_sharedlib_from_linklib_cmd,
[lt_cv_sharedlib_from_linklib_cmd='unknown'
case $host_os in
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# two different shell functions defined in ltmain.sh;
# decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
@@ -3903,7 +3903,7 @@ AC_DEFUN([LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
@@ -3978,7 +3978,7 @@ case $host_os in
aix*)
symcode='[[BCDT]]'
;;
-cygwin* | mingw* | windows* | pw32* | cegcc*)
+cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
@@ -4284,7 +4284,7 @@ m4_if([$1], [CXX], [
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | windows* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4360,7 +4360,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- mingw* | windows* | cygwin* | os2* | pw32* | cegcc*)
+ mingw* | windows* | cygwin* | msys* | os2* | pw32* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4608,7 +4608,7 @@ m4_if([$1], [CXX], [
# PIC is the default for these OSes.
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -4712,7 +4712,7 @@ m4_if([$1], [CXX], [
esac
;;
- mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
+ mingw* | windows* | cygwin* | msys* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
@@ -4993,7 +4993,7 @@ m4_if([$1], [CXX], [
pw32*)
_LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
- cygwin* | mingw* | windows* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | cegcc*)
case $cc_basename in
cl* | icl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
@@ -5051,7 +5051,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
extract_expsyms_cmds=
case $host_os in
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
@@ -5166,7 +5166,7 @@ _LT_EOF
fi
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -5623,7 +5623,7 @@ _LT_EOF
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -6698,7 +6698,7 @@ if test yes != "$_lt_caught_CXX_error"; then
esac
;;
- cygwin* | mingw* | windows* | pw32* | cegcc*)
+ cygwin* | msys* | mingw* | windows* | pw32* | cegcc*)
case $GXX,$cc_basename in
,cl* | no,cl* | ,icl* | no,icl*)
# Native MSVC or ICC
@@ -8329,7 +8329,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
*-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
;;
* ) # otherwise, assume *nix
@@ -8337,12 +8337,12 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd,
;;
esac
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
case $build in
*-*-mingw* | *-*-windows* ) # actually msys
lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
;;
- *-*-cygwin* )
+ *-*-cygwin* | *-*-msys* )
lt_cv_to_host_file_cmd=func_convert_file_noop
;;
* ) # otherwise, assume *nix
diff --git a/m4/ltargz.m4 b/m4/ltargz.m4
index b93c2824..63b8c9be 100644
--- a/m4/ltargz.m4
+++ b/m4/ltargz.m4
@@ -43,7 +43,7 @@ AS_IF([test -z "$LT_ARGZ_H"],
[if argz actually works],
[lt_cv_sys_argz_works],
[[case $host_os in #(
- *cygwin*)
+ *cygwin* | msys*)
lt_cv_sys_argz_works=no
if test no != "$cross_compiling"; then
lt_cv_sys_argz_works="guessing no"
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index c47bb98c..69e56b0c 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -710,7 +710,7 @@ darwin[[1567]].*)
beos*)
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
;;
-cygwin* | mingw* | windows* | pw32*)
+cygwin* | msys* | mingw* | windows* | pw32*)
AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
;;
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 25caa890..e70908de 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
-*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
+*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff --git a/tests/bindir.at b/tests/bindir.at
index 6144e7db..cf6188d6 100644
--- a/tests/bindir.at
+++ b/tests/bindir.at
@@ -62,7 +62,7 @@ AT_SETUP([bindir basic lib test])
bindirneeded=:
case $host_os in
- cygwin*|mingw*|windows*|cegcc*)
+ cygwin*|msys*|mingw*|windows*|cegcc*)
;;
*)
bindirneeded=false
@@ -171,7 +171,7 @@ AT_SETUP([bindir install tests])
bindirneeded=:
case $host_os in
- cygwin*|mingw*|windows*|cegcc*)
+ cygwin*|msys*|mingw*|windows*|cegcc*)
;;
*)
bindirneeded=false
diff --git a/tests/bug_62343.at b/tests/bug_62343.at
index 06a98efc..48d54211 100644
--- a/tests/bug_62343.at
+++ b/tests/bug_62343.at
@@ -53,7 +53,7 @@ AT_CHECK([$GREP -- '-no-canonical-prefixes' stdout], [0], [ignore])
host_flags=:
case $host_os in
- cygwin* | mingw* | windows*)
+ cygwin* | msys* | mingw* | windows*)
host_flags=-no-undefined
;;
*)
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 4be6ad38..c8c58177 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -330,7 +330,7 @@ have_shared=false
$LIBTOOL --features | $GREP 'enable shared libraries' >/dev/null && have_shared=:
case $host_os,$have_shared in
-cygwin* | mingw* | windows* | cegcc* | *,false)
+cygwin* | msys* | mingw* | windows* | cegcc* | *,false)
# These hosts do not support linking without -no-undefined
CPPFLAGS="$CPPFLAGS -DHAVE_UNDEFINED_SYMBOLS=0"
;;

1403
mingw-w64-libtool/0009-libtool-2.4.2.418-msysize.patch
View File

File diff suppressed because it is too large Load Diff

24
mingw-w64-libtool/0010-libtool-2.4.2-include-process-h.patch
View File

@ -1,24 +0,0 @@
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 0418007..91276c2 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -4163,6 +4163,7 @@
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
+# include <process.h>
# include <io.h>
# endif
#endif
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index 0418007..91276c2 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -4163,6 +4163,7 @@
# include <unistd.h>
# include <stdint.h>
# ifdef __CYGWIN__
+# include <process.h>
# include <io.h>
# endif
#endif

16
mingw-w64-libtool/0011-Pick-up-clang_rt-static-archives-compiler-internal-l.patch
View File

@ -1,8 +1,7 @@
From a18473ed4e5574dab899db640b8efeff78939b54 Mon Sep 17 00:00:00 2001
From fc658ffc5fed2dfbf35a85f8e60742f63b7cf203 Mon Sep 17 00:00:00 2001
From: Manoj Gupta <manojgupta@chromium.org>
Date: Wed, 10 Oct 2018 10:50:23 +0300
Subject: [PATCH 1/2] Pick up clang_rt static archives compiler internal
libraries
Subject: [PATCH] Pick up clang_rt static archives compiler internal libraries
Libtool checks only for libraries linked as -l* when trying to
find internal compiler libraries. Clang, however uses the absolute
@ -16,18 +15,15 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b55a6e5..d9322d0 100644
index 93a54713..2457eec5 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then
@@ -7601,7 +7601,7 @@ if AC_TRY_EVAL(ac_compile); then
for p in `eval "$output_verbose_link_cmd"`; do
case $prev$p in
- -L* | -R* | -l*)
+ -L* | -R* | -l* | */libclang_rt.*.a)
# Some compilers place space between "-{L,R}" and the path.
# Some compilers place space between "-{L,R,l}" and the path.
# Remove the space.
if test x-L = "$p" ||
--
2.7.4
if test x-L = x"$p" ||

21
mingw-w64-libtool/0014-Support-llvm-objdump-f-output.patch
View File

@ -1,4 +1,4 @@
From 03dabb6a70847761e65572a2a7b770a3b1b9f123 Mon Sep 17 00:00:00 2001
From 32d1a16e1ba9b73591fb4f17180459a0a8d4a154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
Date: Mon, 12 Apr 2021 23:44:10 +0200
Subject: [PATCH] Support llvm-objdump -f output
@ -9,31 +9,28 @@ Subject: [PATCH] Support llvm-objdump -f output
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index a9f070a..4a434cc 100644
index 860c6a09..e37abbb1 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -3019,7 +3019,7 @@ func_win32_libid ()
@@ -3046,7 +3046,7 @@ func_win32_libid ()
*ar\ archive*) # could be an import, or static
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)' >/dev/null; then
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64|coff-arm|coff-arm64|coff-i386|coff-x86-64)' >/dev/null; then
case $nm_interface in
"MS dumpbin")
if func_cygming_ms_implib_p "$1" ||
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 21a7d60..594be9c 100644
index 2457eec5..8cd75666 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -3473,7 +3473,7 @@ mingw* | pw32*)
@@ -3535,7 +3535,7 @@ mingw* | windows* | pw32*)
lt_cv_file_magic_cmd='func_win32_libid'
else
# Keep this pattern in sync with the one in func_win32_libid.
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)'
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64|coff-arm|coff-arm64|coff-i386|coff-x86-64)'
lt_cv_file_magic_cmd='$OBJDUMP -f'
fi
;;
--
2.31.1

96
mingw-w64-libtool/PKGBUILD
View File

@ -2,10 +2,10 @@
# Contributor: Ray Donnelly <mingw.android@gmail.com>
_realname=libtool
pkgbase=mingw-w64-libtool
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-libtool" "${MINGW_PACKAGE_PREFIX}-libltdl")
pkgver=2.4.7
pkgrel=2
pkgver=2.5.3
pkgrel=1
pkgdesc="A generic library support script (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@ -13,68 +13,70 @@ url="https://www.gnu.org/software/libtool"
msys2_references=(
"cpe: cpe:/a:gnu:libtool"
)
license=("GPL")
license=('spdx:LGPL-2.0-or-later WITH Libtool-exception')
makedepends=(
"${MINGW_PACKAGE_PREFIX}-cc"
"automake-wrapper"
"autoconf-wrapper"
"automake-wrapper"
"help2man"
"m4"
)
source=("https://ftp.gnu.org/pub/gnu/libtool/${_realname}-${pkgver}.tar.xz"{,.sig}
0002-cygwin-mingw-Create-UAC-manifest-files.mingw.patch
0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch
0005-Fix-seems-to-be-moved.patch
0006-Fix-strict-ansi-vs-posix.patch
0007-fix-cr-for-awk-in-configure.all.patch
0009-libtool-2.4.2.418-msysize.patch
0010-libtool-2.4.2-include-process-h.patch
source=(https://ftp.gnu.org/gnu/libtool/${_realname}-${pkgver}.tar.xz{,.sig}
0001-cygwin-mingw-Create-UAC-manifest-files.patch
0001-handle-unset-multilib.patch
0002-Fix-seems-to-be-moved.patch
0003-Fix-STRICT_ANSI-vs-POSIX.patch
0004-Allow-statically-linking-Flang-support-libraries-whe.patch
0005-libtool-include-process.h.patch
0006-Pass-various-flags-to-GCC.patch
0007-msysize.patch
0011-Pick-up-clang_rt-static-archives-compiler-internal-l.patch
0012-Prefer-response-files-over-linker-scripts-for-mingw-.patch
0013-Allow-statically-linking-compiler-support-libraries-.patch
0014-Support-llvm-objdump-f-output.patch
0015-Allow-statically-linking-Flang-support-libraries.patch)
sha256sums=('4f7f217f057ce655ff22559ad221a0fd8ef84ad1fc5fcb6990cecc333aa1635d'
0014-Support-llvm-objdump-f-output.patch)
sha256sums=('898011232cc59b6b3bbbe321b60aba9db1ac11578ab61ed0df0299458146ae2e'
'SKIP'
'fe8b80efd34f9385220ebc90aaec945e44de8c343c75719d6ac0d4e472a6eed5'
'37d46a7964cf56617b897feb566537d847dee5e8f53e4771255d3cccf722918d'
'dc39fbe066958178f96108f07db62b48b9339efddf2c21f800ff8d67110ca393'
'6a94ada08b0a0aa36240efd9ccb826e22ab94ef0969270f2edb8be344dc8c62b'
'd96beecfc5d15f94ce46bbe0e89d6e6fdb973a25ad6be98c30504b58453792c1'
'1a858a13592a1a5bd56ae3c4e610408ca19ec9d318ebdfd96bebcfc585b2924f'
'0f3defa657d353b9f55469f6d514abd96494ce7459ef76bbd63980d8994cafe9'
'c727b2b017163cfdeca60820d3cff2dac8968c5630745602b150f92b159af313'
'67e4f2429dfe67499b1829d0a8312d9a043057db354307f8db41d9f967944346'
'994b6e75cce06557459dea34abd0d3fde462514c7566dea519dbbae800f1d746'
'd873306936060e6c72cf0f3c174131cc85debc2ea6dc924eabdf6e3a813c768e'
'00f0b0429431a884b481eb92f4b138c50bc17eb09f0985d7ebfd4a0a50407eb6'
'30b361a43266dbd80c94fe58196113ad3ae78e134da62d9dfad65ac67e337db8'
'0dd70a4f955ed4cd94a0d13b784b7db7dddbd4d1d6ee5b092202f8b9496fd3eb'
'2cb1b61247a4632698ac7e26c496c3ad8c1b4fde080d301994dbddc0794a4bf4'
'acec8e76b0d65c7b5f442203b2446d92a2f81ceaaa211cd2e6b8a036f5115280'
'de68dc9387f47ee129f55b2f525a7d222374ddd8915f4f42af05f185b779b826'
'c95a65e890b1ae6362807abc66809e72cf81aeea5f9f556e38f9752f974bf435'
'8069e887aeeab7491f15e00547fa66d9b9e86407f5a23f37a6d8c7d165de752e'
'db16cd322e0ebc578c906e94b0788810af17ce617c700a50db2e3c598dbbed7e'
'9fe454603a519e9ac50b32de125d4c5293520142c34a895c6e392a190719ff52')
validpgpkeys=('7C5FBB96BE82B954AC20DF5F6EAC957F8EEB55C0') # "Alex Ameen <alex.ameen.tx@gmail.com>"
'e62e836f018339974f5ef7cf81bc0a4252901158eb0824eb62d0270206093ad7')
validpgpkeys=('7C5FBB96BE82B954AC20DF5F6EAC957F8EEB55C0' # Alex Ameen <alex.ameen.tx@gmail.com>
'FA26CA784BE188927F22B99F6570EA01146F7354') # Ileana Dumitrescu <ileanadumi95@protonmail.com>
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
for _patch in "$@"
do
for _patch in "$@"; do
msg2 "Applying $_patch"
patch -Nbp1 -i "${srcdir}/$_patch"
patch -Nbp1 -i "${srcdir}/${_patch}"
done
}
# =========================================== #
prepare() {
cd "${_realname}-${pkgver}"
# Note: keep the patches in sync with msys libtool
apply_patch_with_msg \
0002-cygwin-mingw-Create-UAC-manifest-files.mingw.patch \
0003-Pass-various-runtime-library-flags-to-GCC.mingw.patch \
0005-Fix-seems-to-be-moved.patch \
0006-Fix-strict-ansi-vs-posix.patch \
0007-fix-cr-for-awk-in-configure.all.patch \
\
0009-libtool-2.4.2.418-msysize.patch \
0010-libtool-2.4.2-include-process-h.patch \
0001-cygwin-mingw-Create-UAC-manifest-files.patch \
0001-handle-unset-multilib.patch \
0002-Fix-seems-to-be-moved.patch \
0003-Fix-STRICT_ANSI-vs-POSIX.patch \
0004-Allow-statically-linking-Flang-support-libraries-whe.patch \
0005-libtool-include-process.h.patch \
0006-Pass-various-flags-to-GCC.patch \
0007-msysize.patch \
0011-Pick-up-clang_rt-static-archives-compiler-internal-l.patch \
0012-Prefer-response-files-over-linker-scripts-for-mingw-.patch \
0013-Allow-statically-linking-compiler-support-libraries-.patch \
0014-Support-llvm-objdump-f-output.patch \
0015-Allow-statically-linking-Flang-support-libraries.patch
0014-Support-llvm-objdump-f-output.patch
}
build() {
@ -89,26 +91,36 @@ build() {
make
}
check() {
cd "${_realname}-${pkgver}"
make check -k || warning "Tests failed"
}
package_libtool() {
depends=("${MINGW_PACKAGE_PREFIX}-libltdl")
depends=("${MINGW_PACKAGE_PREFIX}-libltdl=${pkgver}" "bash")
cd "${_realname}-${pkgver}"
make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
install-data-local
install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${pkgname#${MINGW_PACKAGE_PREFIX}-}"
# Fix paths
local WINPREFIX=$(cygpath -wm ${MINGW_PREFIX})
sed -i "s|${WINPREFIX}|${MINGW_PREFIX}|g" "${pkgdir}${MINGW_PREFIX}/bin/libtool"
}
package_libltdl() {
pkgdesc="A system independent dlopen wrapper for GNU libtool"
pkgdesc="A system independent dlopen wrapper for GNU libtool (mingw-w64)"
cd "${_realname}-${pkgver}"
make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
install-ltdlincludeHEADERS
install -Dm644 "${srcdir}/${_realname}-${pkgver}/libltdl/COPYING.LIB" -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${pkgname#${MINGW_PACKAGE_PREFIX}-}"
}
# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;