<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4669e26391558c056ff37651b41653c9b5e37ee">https://github.com/macports/macports-ports/commit/d4669e26391558c056ff37651b41653c9b5e37ee</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 d4669e26391 avarice: Fix build failure with binutils 2.34
</span>d4669e26391 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4669e26391558c056ff37651b41653c9b5e37ee
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 9 17:05:03 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> avarice: Fix build failure with binutils 2.34
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fix various other warnings and errors I noticed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60807
</span>---
cross/avarice/Portfile | 26 +++++--------
cross/avarice/files/binutils-2.34.patch | 44 ++++++++++++++++++++++
.../files/fix-tautological-constant-compare.patch | 34 +++++++++++++++++
cross/avarice/files/include-autoconf.h.patch | 25 ++++++++++++
cross/avarice/files/return-NULL.patch | 16 ++++++++
5 files changed, 129 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/avarice/Portfile b/cross/avarice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f26a140d30b..7e1d56598bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/avarice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/avarice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name avarice
version 2.13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories cross
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,9 +13,10 @@ maintainers nomaintainer
</span> description AVR JTAG-ICE control software
long_description AVaRICE is a program which interfaces the GNU Debugger \
GDB with the AVR JTAG ICE available from Atmel.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://avarice.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:avr-binutils \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:binutils \
</span> port:gettext \
port:libusb-compat \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,20 +24,13 @@ depends_lib port:avr-binutils \
</span> master_sites sourceforge:project/avarice/avarice/avarice-${version}
use_bzip2 yes
checksums rmd160 dbba18767365c5f8ef302380842f3a6a2fb06a7a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a14738fe78e1a0a9321abcca7e685a00ce3ced207622ccbcd881ac32030c104a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -L${prefix}/avr/host/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PACKAGE/PACKAGE_VERSION are required to work around an
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# #ifdef check added in recent versions of binutils. This broke
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# a lot of software, assumes a very specific use of autotools, and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is entirely gratitous, but the binutils guys aren't backing down.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See also: http://sourceware.org/bugzilla/show_bug.cgi?id=14072
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and: http://sourceware.org/bugzilla/show_bug.cgi?id=14243
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -DPACKAGE=${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPACKAGE_VERSION=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/avr/host/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a14738fe78e1a0a9321abcca7e685a00ce3ced207622ccbcd881ac32030c104a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 196063
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles include-autoconf.h.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ binutils-2.34.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-tautological-constant-compare.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return-NULL.patch
</span>
configure.args --enable-target-programming
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/avarice/files/binutils-2.34.patch b/cross/avarice/files/binutils-2.34.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..568e4fdf7b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/avarice/files/binutils-2.34.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure with binutils 2.34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/avarice/bugs/25/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2012-11-05 10:49:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-07-09 16:29:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5458,7 +5458,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bfd_init();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file = bfd_openr("foo", 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bfd_get_section_name(file, file->sections);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bfd_section_name(file->sections);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 42;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtag2prog.cc.orig 2020-07-09 16:05:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtag2prog.cc 2020-07-09 16:31:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,8 +48,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE_TARGET_PROGRAMMING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The API changed for this in bfd.h. This is a work around.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef bfd_get_section_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define bfd_get_section_name(bfd, ptr) bfd_section_name(ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef bfd_get_section_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define bfd_get_section_size bfd_get_section_size_before_reloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define bfd_get_section_size bfd_section_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void initImage(BFDimage *image)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtagprog.cc.orig 2020-07-09 16:05:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtagprog.cc 2020-07-09 16:31:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,8 +47,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE_TARGET_PROGRAMMING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The API changed for this in bfd.h. This is a work around.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef bfd_get_section_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define bfd_get_section_name(bfd, ptr) bfd_section_name(ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef bfd_get_section_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# define bfd_get_section_size bfd_get_section_size_before_reloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define bfd_get_section_size bfd_section_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void initImage(BFDimage *image)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/avarice/files/fix-tautological-constant-compare.patch b/cross/avarice/files/fix-tautological-constant-compare.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c49bd76ea63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/avarice/files/fix-tautological-constant-compare.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+warning: result of comparison of constant 0 with expression of type 'bool' is always false [-Wtautological-constant-compare]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/avarice/bugs/26/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtagprog.cc.orig 2020-07-09 16:45:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtagprog.cc 2020-07-09 16:49:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +207,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void jtag1::enableProgramming(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ programmingEnabled = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (doSimpleJtagCommand(0xa3, 1) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!doSimpleJtagCommand(0xa3, 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "JTAG ICE: Failed to enable programming\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw jtag_exception();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +218,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void jtag1::disableProgramming(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ programmingEnabled = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (doSimpleJtagCommand(0xa4, 1) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!doSimpleJtagCommand(0xa4, 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "JTAG ICE: Failed to disable programming\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw jtag_exception();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // (unless the save-eeprom fuse is set).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void jtag1::eraseProgramMemory(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (doSimpleJtagCommand(0xa5, 1) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!doSimpleJtagCommand(0xa5, 1))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "JTAG ICE: Failed to erase program memory\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw jtag_exception();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/avarice/files/include-autoconf.h.patch b/cross/avarice/files/include-autoconf.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c1107d15ba5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/avarice/files/include-autoconf.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+New versions of bfd.h break build on Linux and Mac OS systems. Including
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bfd.h requires constants to be defined, that are provided by autoconf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Including autoconf.h into the files fixes the error.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/avarice/patches/26/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtag2prog.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtag2prog.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE_TARGET_PROGRAMMING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include "autoconf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <bfd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtagprog.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtagprog.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE_TARGET_PROGRAMMING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include "autoconf.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <bfd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/avarice/files/return-NULL.patch b/cross/avarice/files/return-NULL.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d709aa54778
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/avarice/files/return-NULL.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix return value of jtag1::jtagRead:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: cannot initialize return object of type 'uchar *' (aka 'unsigned char *') with an rvalue of type 'bool'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/avarice/bugs/24/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/jtagrw.cc.orig 2018-06-27 21:49:14 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/jtagrw.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,7 +131,7 @@ uchar *jtag1::jtagRead(unsigned long add
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ numLocations = (numBytes + 1) / 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (numLocations > 256)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command[1] = whichSpace;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ command[2] = numLocations - 1;
</span></pre><pre style='margin:0'>
</pre>