<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e9204bba7f62cef7eb2f08d3b2140caf0bc8b2cd">https://github.com/macports/macports-ports/commit/e9204bba7f62cef7eb2f08d3b2140caf0bc8b2cd</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 e9204bba7f6 *-mingw32-binutils: Update to 2.39
</span>e9204bba7f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e9204bba7f62cef7eb2f08d3b2140caf0bc8b2cd
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Mon Aug 8 16:37:42 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> *-mingw32-binutils: Update to 2.39
</span>---
_resources/port1.0/group/crossbinutils-1.0.tcl | 97 ++--------------------
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, 8 insertions(+), 141 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 a26d34e05f9..4b5de6584a7 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;'>@@ -76,6 +76,11 @@ array set crossbinutils.versions_info {
</span> sha256 e316477a914f567eccc34d5d29785b8b0f5a10208d36bbacedcc39048ecfe024 \
size 23651408
}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2.39 {xz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 eb5d638227d0543d3055fc7e6d8d8c28534f55c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 25167756
</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;'>@@ -117,49 +122,6 @@ proc crossbinutils.setup {target version} {
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set infopages {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gas/doc as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bfd/doc bfd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- binutils/doc binutils
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gprof gprof
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ld ld
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {dir page} ${infopages} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix texi|info source file(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set tex [glob -directory ${worksrcpath}/${dir} ${page}.texi*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q s/(${page})/(${crossbinutils.target}-${page})/g ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/@file{${page}}/@file{${crossbinutils.target}-${page}}/g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${tex} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${tex}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix Makefile(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}/Makefile.in" ] } {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {binutils gas} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix packages names
</span><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;'>- if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Install target-compatible libbfd/bfd-plugins/libiberty in the target's directory
reinplace -q "s|bfdlibdir=.*|bfdlibdir='${prefix}/${crossbinutils.target}/host/lib'|g" \
${worksrcpath}/bfd/configure \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,53 +137,6 @@ proc crossbinutils.setup {target version} {
</span> ${worksrcpath}/libiberty/Makefile.in
reinplace -q "s|/\$(MULTIOSDIR)||g" \
${worksrcpath}/libiberty/Makefile.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${version} "2.38"] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set infopages {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libctf/doc ctf-spec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {dir page} ${infopages} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix texi|info source file(s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}" ] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set info [glob -directory ${worksrcpath}/${dir} ${page}.info*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${info}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q s/(${page})/(${crossbinutils.target}-${page})/g ${info}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/@file{${page}}/@file{${crossbinutils.target}-${page}}/g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${info}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${info} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${info}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}" ] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set tex [glob -directory ${worksrcpath}/${dir} ${page}.texi*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /setfilename/s/${page}/${crossbinutils.target}-${page}/ ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q s/(${page})/(${crossbinutils.target}-${page})/g ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -q \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s/@file{${page}}/@file{${crossbinutils.target}-${page}}/g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${tex}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${tex} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${dir}/${crossbinutils.target}-${page}[file extension ${tex}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libctf} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix packages names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {libctf} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [ file exists "${worksrcpath}/${dir}/configure" ] } {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
depends_lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +153,7 @@ proc crossbinutils.setup {target version} {
</span> --target=${target} \
--program-prefix=${target}- \
--enable-install-libiberty=${prefix}/${crossbinutils.target}/host \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --infodir=${prefix}/share/info \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --infodir=${prefix}/share/info/${target} \
</span> --mandir=${prefix}/share/man \
--datarootdir=${prefix}/share/${crossbinutils.target} \
<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 54add9e884e..06a6f1d8c6e 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,14 +7,11 @@ 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.38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossbinutils.setup ${mingw_target} 2.39
</span> revision 0
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch remove binutils 2.39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f4d62360df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/i686-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git binutils/dlltool.c binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d95bf3f5470..89871510b45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3992,10 +3992,11 @@ main (int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (tmp_prefix == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If possible use a deterministic prefix. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (dll_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (imp_name || delayimp_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmp_prefix = xmalloc (strlen (dll_name) + 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sprintf (tmp_prefix, "%s_", dll_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *input = imp_name ? imp_name : delayimp_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_prefix = xmalloc (strlen (input) + 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf (tmp_prefix, "%s_", input);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; tmp_prefix[i]; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ISALNUM (tmp_prefix[i]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 81334b56e18..0c472a2413b 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,14 +7,11 @@ 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.38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+crossbinutils.setup ${mingw_target} 2.39
</span> revision 0
maintainers {mojca @mojca} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch remove binutils 2.39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f4d62360df..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/x86_64-w64-mingw32-binutils/files/patch-dlltool-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git binutils/dlltool.c binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d95bf3f5470..89871510b45 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ binutils/dlltool.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3992,10 +3992,11 @@ main (int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (tmp_prefix == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If possible use a deterministic prefix. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (dll_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (imp_name || delayimp_name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmp_prefix = xmalloc (strlen (dll_name) + 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sprintf (tmp_prefix, "%s_", dll_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *input = imp_name ? imp_name : delayimp_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tmp_prefix = xmalloc (strlen (input) + 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf (tmp_prefix, "%s_", input);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; tmp_prefix[i]; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ISALNUM (tmp_prefix[i]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tmp_prefix[i] = '_';
</span></pre><pre style='margin:0'>
</pre>