<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2c4fef5f3688ce620bf70368dbbc827b68465e29">https://github.com/macports/macports-ports/commit/2c4fef5f3688ce620bf70368dbbc827b68465e29</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2c4fef5f368 *-w64-mingw32-binutils: Update to 2.38
</span>2c4fef5f368 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2c4fef5f3688ce620bf70368dbbc827b68465e29
</span>Author: Gcenx <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Fri Feb 11 09:37:35 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> *-w64-mingw32-binutils: Update to 2.38
</span>---
_resources/port1.0/group/crossbinutils-1.0.tcl | 39 +++++++++++++++++-----
cross/i686-w64-mingw32-binutils/Portfile | 5 ++-
.../files/patch-dlltool-fix.diff | 21 ++++++++++++
cross/x86_64-w64-mingw32-binutils/Portfile | 5 ++-
.../files/patch-dlltool-fix.diff | 21 ++++++++++++
5 files changed, 80 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/crossbinutils-1.0.tcl b/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ac2a92436db..13c28fdadfa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/crossbinutils-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,11 @@ array set crossbinutils.versions_info {
</span> sha256 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c \
size 22916924
}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2.38 {xz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e6d37fd602fefa25560937efb57ed3b126d7578b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23651408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }}
</span> }
proc crossbinutils.setup {target version} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,6 +123,7 @@ proc crossbinutils.setup {target version} {
</span> binutils/doc binutils
gprof gprof
ld ld
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libctf/doc ctf-spec
</span> }
foreach {dir page} ${infopages} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,19 +138,30 @@ proc crossbinutils.setup {target version} {
</span> move ${tex} \
${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${tex}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q -E \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${dir}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix Makefile(s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [ file exists "${worksrcpath}/${dir}/Makefile.in" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${dir}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir2 {binutils gas libctf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [ file exists "${worksrcpath}/${dir2}/configure" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s/\[\[:<:\]\]${page}\\.(info|texi)/${crossbinutils.target}-&/g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${dir2}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# Fix packages' names.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {bfd binutils gas gold gprof ld opcodes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q "/^ PACKAGE=/s/=.*/=${crossbinutils.target}-${dir}/" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${dir}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir {bfd binutils gas gold gprof ld opcodes libctf} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "/^ PACKAGE=/s/=.*/=${crossbinutils.target}-${dir}/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/${dir}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install target-compatible libbfd/libiberty in the target's directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install target-compatible libbfd/bfd-plugins/libiberty in the target's directory
</span> reinplace -q "s|bfdlibdir=.*|bfdlibdir='${prefix}/${crossbinutils.target}/host/lib'|g" \
${worksrcpath}/bfd/configure \
${worksrcpath}/opcodes/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +191,11 @@ proc crossbinutils.setup {target version} {
</span> configure.args \
--target=${target} \
--program-prefix=${target}- \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-install-libiberty=${prefix}/${crossbinutils.target}/host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-install-libiberty=${prefix}/${crossbinutils.target}/host \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --datarootdir=${prefix}/share/${crossbinutils.target} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
build.dir ${workpath}/build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-binutils/Portfile b/cross/i686-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32c6ac16c59..54add9e884e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/i686-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,14 @@ PortGroup crossbinutils 1.0
</span> set mingw_name w64-mingw32
set mingw_arch i686
set mingw_target ${mingw_arch}-${mingw_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-crossbinutils.setup ${mingw_target} 2.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossbinutils.setup ${mingw_target} 2.38
</span> revision 0
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch remove binutils 2.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--disable-multilib \
--disable-werror
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/i686-w64-mingw32-binutils/files/patch-dlltool-fix.diff b/cross/i686-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f4d62360df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/i686-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=binutils%2Fdlltool.c;h=89871510b459a78ba1076368e3752c677f8daaf6;hp=d95bf3f5470b999fa3b30bc887791859f48d81d1;hb=d65c0ddddd85645cab6f11fd711d21638a74489f;hpb=a2757c4ed693cef4ecc4dcdcb2518353eb6b3c3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git binutils/dlltool.c binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d95bf3f5470..89871510b45 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3992,10 +3992,11 @@ main (int ac, char **av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tmp_prefix == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If possible use a deterministic prefix. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dll_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (imp_name || delayimp_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp_prefix = xmalloc (strlen (dll_name) + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf (tmp_prefix, "%s_", dll_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *input = imp_name ? imp_name : delayimp_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp_prefix = xmalloc (strlen (input) + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf (tmp_prefix, "%s_", input);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; tmp_prefix[i]; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ISALNUM (tmp_prefix[i]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp_prefix[i] = '_';
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/x86_64-w64-mingw32-binutils/Portfile b/cross/x86_64-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e9dc961f21..81334b56e18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/x86_64-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/x86_64-w64-mingw32-binutils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,14 @@ PortGroup crossbinutils 1.0
</span> set mingw_name w64-mingw32
set mingw_arch x86_64
set mingw_target ${mingw_arch}-${mingw_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-crossbinutils.setup ${mingw_target} 2.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossbinutils.setup ${mingw_target} 2.38
</span> revision 0
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch remove binutils 2.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--disable-multilib \
--disable-werror
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/x86_64-w64-mingw32-binutils/files/patch-dlltool-fix.diff b/cross/x86_64-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f4d62360df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/x86_64-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=blobdiff_plain;f=binutils%2Fdlltool.c;h=89871510b459a78ba1076368e3752c677f8daaf6;hp=d95bf3f5470b999fa3b30bc887791859f48d81d1;hb=d65c0ddddd85645cab6f11fd711d21638a74489f;hpb=a2757c4ed693cef4ecc4dcdcb2518353eb6b3c3f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git binutils/dlltool.c binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d95bf3f5470..89871510b45 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3992,10 +3992,11 @@ main (int ac, char **av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tmp_prefix == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* If possible use a deterministic prefix. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (dll_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (imp_name || delayimp_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmp_prefix = xmalloc (strlen (dll_name) + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sprintf (tmp_prefix, "%s_", dll_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *input = imp_name ? imp_name : delayimp_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmp_prefix = xmalloc (strlen (input) + 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sprintf (tmp_prefix, "%s_", input);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; tmp_prefix[i]; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!ISALNUM (tmp_prefix[i]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmp_prefix[i] = '_';
</span></pre><pre style='margin:0'>
</pre>