<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7bf0bb52e3fdf82dff62864f75b73ee60bdccf46">https://github.com/macports/macports-ports/commit/7bf0bb52e3fdf82dff62864f75b73ee60bdccf46</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 7bf0bb52e3f rmlint: fix build on old systems, fix universal variant
</span>7bf0bb52e3f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7bf0bb52e3fdf82dff62864f75b73ee60bdccf46
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jun 1 20:25:36 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> rmlint: fix build on old systems, fix universal variant
</span>---
sysutils/rmlint/Portfile | 24 +++++-
sysutils/rmlint/files/patch-darwin-old.diff | 119 ++++++++++++++++++++++++++++
sysutils/rmlint/files/patch-universal.diff | 18 +++++
3 files changed, 160 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rmlint/Portfile b/sysutils/rmlint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07ef0ddd23b..c7620de6692 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rmlint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rmlint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,10 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
github.setup sahib rmlint 2.10.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
homepage http://rmlint.rtfd.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,10 +34,31 @@ depends_build-append \
</span> depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:json-glib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-darwin-old.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd ${prefix}/bin/scons
build.args --prefix=${prefix} VERBOSE=1
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc-4.2 fails to build it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-4*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset universal] && [info exists universal_archs_supported]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Without this SCons builds a fake universal with a single arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-universal.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile ${worksrcpath}-${arch}/SConstruct]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@ARCH@|${arch}|" ${worksrcpath}-${arch}/SConstruct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rmlint/files/patch-darwin-old.diff b/sysutils/rmlint/files/patch-darwin-old.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ac4ab394d4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rmlint/files/patch-darwin-old.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,119 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://gist.github.com/ingramj/1105106/adfad1a7b1f0575dd7737c296d644856f2c2d074
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/cmdline.c.orig 2020-06-13 17:42:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/cmdline.c 2022-05-31 20:35:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,97 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <search.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __STDC_VERSION__ >= 199901L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* restrict is a keyword */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define restrict
</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;'>++#ifndef _POSIX_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef long ssize_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SSIZE_MAX LONG_MAX
</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;'>++ssize_t getdelim(char **restrict lineptr, size_t *restrict n, int delimiter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *restrict stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ssize_t getline(char **restrict lineptr, size_t *restrict n,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *restrict stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _GETDELIM_GROWBY 128 /* amount to grow line buffer by */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _GETDELIM_MINLEN 4 /* minimum line buffer size */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ssize_t getdelim(char **restrict lineptr, size_t *restrict n, int delimiter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *restrict stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *buf, *pos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ssize_t bytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (lineptr == NULL || n == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stream == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EBADF;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* resize (or allocate) the line buffer if necessary */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buf = *lineptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (buf == NULL || *n < _GETDELIM_MINLEN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buf = realloc(*lineptr, _GETDELIM_GROWBY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (buf == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* ENOMEM */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *n = _GETDELIM_GROWBY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *lineptr = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* read characters until delimiter is found, end of file is reached,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ or an error occurs. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytes = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pos = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while ((c = getc(stream)) != EOF) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bytes + 1 >= SSIZE_MAX) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ errno = EOVERFLOW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bytes++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bytes >= *n - 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buf = realloc(*lineptr, *n + _GETDELIM_GROWBY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (buf == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* ENOMEM */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *n += _GETDELIM_GROWBY;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pos = buf + bytes - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *lineptr = buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *pos++ = (char) c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (c == delimiter) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (ferror(stream) || (feof(stream) && (bytes == 0))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* EOF, or an error from getc(). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *pos = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return bytes;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ssize_t getline(char **restrict lineptr, size_t *restrict n,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *restrict stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return getdelim(lineptr, n, '\n', stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</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;'>+ #include "cmdline.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "formats.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hash-utility.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/hboetes/mg/issues/7#issuecomment-475869095
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/traverse.c.orig 2020-06-13 17:42:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/traverse.c 2022-05-31 19:48:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "fts/fts.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define st_atim st_atimespec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define st_ctim st_ctimespec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define st_mtim st_mtimespec
</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;'>+ //////////////////////
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // TRAVERSE SESSION //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //////////////////////
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rmlint/files/patch-universal.diff b/sysutils/rmlint/files/patch-universal.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..662ca7ecdb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rmlint/files/patch-universal.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- SConstruct.orig 2020-06-13 17:42:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ SConstruct 2022-06-01 18:56:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -686,6 +686,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.Append(CCFLAGS=['-fPIC'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Universal binaries support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++conf.env.Append(CCFLAGS=[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-arch', '@ARCH@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++conf.env.Append(LINKFLAGS=[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-arch', '@ARCH@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # check _mm_crc32_u64 (SSE4.2) support:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.check_mm_crc32_u64()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>