<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/195adb123b397d5ae850d91105f668aff83e8161">https://github.com/macports/macports-ports/commit/195adb123b397d5ae850d91105f668aff83e8161</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 195adb123b3 elftoolchain: Fix implicit func decls; other fixes
</span>195adb123b3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 195adb123b397d5ae850d91105f668aff83e8161
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jul 2 12:07:33 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> elftoolchain: Fix implicit func decls; other fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit declaration of function htole32 which caused build failure
</span><span style='display:block; white-space:pre;color:#404040;'> on Xcode 12 and later.
</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/62419
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove unneeded additions of defines of htobe32 in archive.c and write.c
</span><span style='display:block; white-space:pre;color:#404040;'> because it's already defined in _elftc.h. Use makefile portgroup to
</span><span style='display:block; white-space:pre;color:#404040;'> simplify using the right compiler and flags. Copy build.args to
</span><span style='display:block; white-space:pre;color:#404040;'> destroot.args programmatically to avoid code duplication. Don't need to
</span><span style='display:block; white-space:pre;color:#404040;'> set destroot.target since it's already set by base. Remove unneeded
</span><span style='display:block; white-space:pre;color:#404040;'> addition of CFLAGS and LDFLAGS in elftoolchain.prog.mk since the
</span><span style='display:block; white-space:pre;color:#404040;'> makefile portgroup already sets them. Patch make-toolchain-version to no
</span><span style='display:block; white-space:pre;color:#404040;'> longer use svnversion or git describe since we're not using a working
</span><span style='display:block; white-space:pre;color:#404040;'> copy or clone and since those utilities might not be installed. Create
</span><span style='display:block; white-space:pre;color:#404040;'> relative symlinks rather than absolute. Fix erroneously formatted
</span><span style='display:block; white-space:pre;color:#404040;'> warning in elftoolchain.tex.mk by changing echo -n to printf. Specify
</span><span style='display:block; white-space:pre;color:#404040;'> full sourceforge path to avoid redirects and fetch failures. Add size to
</span><span style='display:block; white-space:pre;color:#404040;'> checksums. Add modeline.
</span>---
devel/elftoolchain/Portfile | 36 ++++++++++------------
.../elftoolchain/files/patch-byteorder-macros.diff | 34 +++++---------------
.../patch-libelftc-make-toolchain-version.diff | 21 +++++++++++++
.../files/patch-mk-elftoolchain.tex.mk.diff | 12 ++++++++
devel/elftoolchain/files/patch-mk.diff | 17 ++--------
5 files changed, 59 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/elftoolchain/Portfile b/devel/elftoolchain/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eee93efad7c..f427394c9d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/elftoolchain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/elftoolchain/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
name elftoolchain
version 0.7.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,11 +17,12 @@ long_description \
</span> the tools nm, ar, as, elfdump and more.
homepage http://elftoolchain.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/${name}/Sources/${name}-${version}/
</span> use_bzip2 yes
checksums rmd160 9e341f86573d80dd2b390d79cf82f239ecd279ff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 44f14591fcf21294387215dd7562f3fb4bec2f42f476cf32420a6bbabb2bd2b5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 44f14591fcf21294387215dd7562f3fb4bec2f42f476cf32420a6bbabb2bd2b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5361427
</span>
depends_build port:bmake \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,20 +30,18 @@ depends_build port:bmake \
</span>
depends_lib port:libarchive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-mk.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-byteorder-macros.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-byteorder-macros.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libelftc-make-toolchain-version.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mk.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mk-elftoolchain.tex.mk.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PREFIX@:${prefix}:g" ${worksrcpath}/mk/elftoolchain.prog.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.prefix_name prefix
</span>
build.type bsd
build.cmd ${prefix}/bin/bmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args BINDIR=${prefix}/bin \
</span> LIBDIR=${prefix}/lib/elftoolchain \
SHLIBDIR=${prefix}/lib/elftoolchain \
INCSDIR=${prefix}/include/elftoolchain \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,14 +54,7 @@ build.args-append WITH_TESTS=no
</span> # Exclude docs to avoid pulling in a full TeX distribution
build.args-append MKTEX=no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBDIR=${prefix}/lib/elftoolchain \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHLIBDIR=${prefix}/lib/elftoolchain \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCSDIR=${prefix}/include/elftoolchain \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDIR=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANTARGET=man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
# Do not strip binaries as that leads to errors
destroot.args-append STRIP=
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +70,7 @@ post-destroot {
</span> foreach f [glob -tails -directory ${destroot}${prefix}/bin *] {
set nf elftc-$f
move ${destroot}${prefix}/bin/$f ${destroot}${prefix}/bin/$nf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/$nf ${destroot}${prefix}/libexec/${name}/$f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../../bin/$nf ${destroot}${prefix}/libexec/${name}/$f
</span> }
foreach f [glob ${destroot}${prefix}/share/man/man{1,5}/*] {
move $f [file dirname $f]/elftc-[file tail $f]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/elftoolchain/files/patch-byteorder-macros.diff b/devel/elftoolchain/files/patch-byteorder-macros.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1db480d9d04..f9adc224dbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/elftoolchain/files/patch-byteorder-macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/elftoolchain/files/patch-byteorder-macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ar/write.c 2012-04-24 04:33:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ar/write.c 2012-09-25 11:27:38.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/_elftc.h.orig 2015-08-31 14:53:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/_elftc.h 2021-07-02 09:05:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -374,6 +374,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ELFTC_VCSID("$Id: write.c 2496 2012-04-24 02:33:40Z jkoshy $");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define htobe32(x) OSSwapHostToBigInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define htole32(x) OSSwapHostToLittleInt32(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define roundup2 roundup
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define htobe32(x) OSSwapHostToBigInt32(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _ARMAG_LEN 8 /* length of the magic string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _ARHDR_LEN 60 /* length of the archive header */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _INIT_AS_CAP 128 /* initial archive string table size */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- elfcopy/archive.c 2012-02-25 01:00:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ elfcopy/archive.c 2012-02-25 01:00:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +42,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELFTC_VCSID("$Id: archive.c 2370 2011-12-29 12:48:12Z jkoshy $");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <libkern/OSByteOrder.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define htobe32(x) OSSwapHostToBigInt32(x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _ARMAG_LEN 8 /* length of ar magic string */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _ARHDR_LEN 60 /* length of ar header */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _INIT_AS_CAP 128 /* initial archive string table size */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ELFTC_BYTE_ORDER _BYTE_ORDER
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/elftoolchain/files/patch-libelftc-make-toolchain-version.diff b/devel/elftoolchain/files/patch-libelftc-make-toolchain-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b003633e24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/elftoolchain/files/patch-libelftc-make-toolchain-version.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;'>+Don't use svnversion or git describe since we're not using a svn wc or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git clone and since the svnversion or git commands might not exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libelftc/make-toolchain-version.orig 2016-02-16 16:58:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libelftc/make-toolchain-version 2021-07-02 13:06:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curdir=`pwd`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${top} || usage "ERROR: Cannot change directory to \"${top}\"."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++versionstring=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -d CVS ]; then # Look for CVS (NetBSD).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versionstring=" cvs:unknown"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else # Try git (DragonFlyBSD).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,6 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "ERROR: cannot determine a revision number." 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd ${curdir} || usage "Cannot change back to ${curdir}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/elftoolchain/files/patch-mk-elftoolchain.tex.mk.diff b/devel/elftoolchain/files/patch-mk-elftoolchain.tex.mk.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..56b936e3d0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/elftoolchain/files/patch-mk-elftoolchain.tex.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change non-portable echo -n to printf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mk/elftoolchain.tex.mk.orig 2012-08-27 22:39:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mk/elftoolchain.tex.mk 2021-07-02 10:41:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all clean clobber depend install obj: .PHONY .SILENT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo -n WARNING: make \"${.TARGET}\" in \"${.CURDIR:T}\" skipped:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "WARNING: make \"%s\" in \"%s\" skipped:" "${.TARGET}" "${.CURDIR:T}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .if defined(MKTEX) && ${MKTEX} == "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo " missing tools."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/elftoolchain/files/patch-mk.diff b/devel/elftoolchain/files/patch-mk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e93e811dc7c..6589821d608 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/elftoolchain/files/patch-mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/elftoolchain/files/patch-mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,8 @@
</span> --- mk/elftoolchain.prog.mk.orig 2017-06-11 16:21:28.000000000 +0200
+++ mk/elftoolchain.prog.mk 2017-06-11 16:21:47.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +50,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS+= -L/usr/pkg/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.if ${OS_HOST} == "Darwin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS+= -I@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS+= -L@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+.endif
</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;'>- # Handle lex(1) and yacc(1) in a portable fashion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span> --- mk/os.Darwin.mk (revision 3546)
+++ mk/os.Darwin.mk (working copy)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,6 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,5 @@
</span> # Build definitions for Darwin
# Apple ships libarchive, but for some reason does not provide the headers.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,5 +10,4 @@
</span> -LDFLAGS+= -L/usr/local/opt/libarchive/lib
-CFLAGS+= -I/usr/local/opt/libarchive/include
+# Build against a MacPorts-provided libarchive library and headers.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# LDFLAGS/CFLAGS for libarchive have to be added in mk/elftoolchain.prog.mk to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# respect the library search order.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# LDFLAGS/CFLAGS for libarchive have to be set in the environment.
</span></pre><pre style='margin:0'>
</pre>