Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rmlint: fix build on old systems, fix universal variant #15003

Merged
merged 1 commit into from
Jun 1, 2022
Merged

rmlint: fix build on old systems, fix universal variant #15003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion sysutils/rmlint/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
PortSystem 1.0
PortGroup github 1.0
PortGroup makefile 1.0
PortGroup muniversal 1.0

github.setup sahib rmlint 2.10.1 v
revision 1
revision 2

homepage http://rmlint.rtfd.org

Expand Down Expand Up @@ -33,10 +34,31 @@ depends_build-append \
depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:json-glib

platform darwin {
if {${os.major} < 11} {
patchfiles-append patch-darwin-old.diff
}
}

build.cmd ${prefix}/bin/scons
build.args --prefix=${prefix} VERBOSE=1
build.target

# gcc-4.2 fails to build it
compiler.blacklist-append *gcc-4*

if {[variant_isset universal] && [info exists universal_archs_supported]} {
# Without this SCons builds a fake universal with a single arch
patchfiles-append patch-universal.diff
post-configure {
foreach arch ${universal_archs_supported} {
if {[file isfile ${worksrcpath}-${arch}/SConstruct]} {
reinplace "s|@ARCH@|${arch}|" ${worksrcpath}-${arch}/SConstruct
}
}
}
}

use_configure no

destroot {
Expand Down
119 changes: 119 additions & 0 deletions sysutils/rmlint/files/patch-darwin-old.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
See: https://gist.github.com/ingramj/1105106/adfad1a7b1f0575dd7737c296d644856f2c2d074
--- lib/cmdline.c.orig 2020-06-13 17:42:45.000000000 +0800
+++ lib/cmdline.c 2022-05-31 20:35:42.000000000 +0800
@@ -39,6 +39,97 @@
#include <search.h>
#include <sys/time.h>

+#if defined(__APPLE__)
+#if __STDC_VERSION__ >= 199901L
+/* restrict is a keyword */
+#else
+# define restrict
+#endif
+
+#ifndef _POSIX_SOURCE
+typedef long ssize_t;
+#define SSIZE_MAX LONG_MAX
+#endif
+
+ssize_t getdelim(char **restrict lineptr, size_t *restrict n, int delimiter,
+ FILE *restrict stream);
+ssize_t getline(char **restrict lineptr, size_t *restrict n,
+ FILE *restrict stream);
+
+#define _GETDELIM_GROWBY 128 /* amount to grow line buffer by */
+#define _GETDELIM_MINLEN 4 /* minimum line buffer size */
+
+ssize_t getdelim(char **restrict lineptr, size_t *restrict n, int delimiter,
+ FILE *restrict stream)
+{
+ char *buf, *pos;
+ int c;
+ ssize_t bytes;
+
+ if (lineptr == NULL || n == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
+ if (stream == NULL) {
+ errno = EBADF;
+ return -1;
+ }
+
+ /* resize (or allocate) the line buffer if necessary */
+ buf = *lineptr;
+ if (buf == NULL || *n < _GETDELIM_MINLEN) {
+ buf = realloc(*lineptr, _GETDELIM_GROWBY);
+ if (buf == NULL) {
+ /* ENOMEM */
+ return -1;
+ }
+ *n = _GETDELIM_GROWBY;
+ *lineptr = buf;
+ }
+
+ /* read characters until delimiter is found, end of file is reached,
+ or an error occurs. */
+ bytes = 0;
+ pos = buf;
+ while ((c = getc(stream)) != EOF) {
+ if (bytes + 1 >= SSIZE_MAX) {
+ errno = EOVERFLOW;
+ return -1;
+ }
+ bytes++;
+ if (bytes >= *n - 1) {
+ buf = realloc(*lineptr, *n + _GETDELIM_GROWBY);
+ if (buf == NULL) {
+ /* ENOMEM */
+ return -1;
+ }
+ *n += _GETDELIM_GROWBY;
+ pos = buf + bytes - 1;
+ *lineptr = buf;
+ }
+
+ *pos++ = (char) c;
+ if (c == delimiter) {
+ break;
+ }
+ }
+
+ if (ferror(stream) || (feof(stream) && (bytes == 0))) {
+ /* EOF, or an error from getc(). */
+ return -1;
+ }
+
+ *pos = '\0';
+ return bytes;
+}
+
+ssize_t getline(char **restrict lineptr, size_t *restrict n,
+ FILE *restrict stream)
+{
+ return getdelim(lineptr, n, '\n', stream);
+}
+#endif
+
#include "cmdline.h"
#include "formats.h"
#include "hash-utility.h"


# See: https://github.com/hboetes/mg/issues/7#issuecomment-475869095
--- lib/traverse.c.orig 2020-06-13 17:42:45.000000000 +0800
+++ lib/traverse.c 2022-05-31 19:48:09.000000000 +0800
@@ -41,6 +41,12 @@

#include "fts/fts.h"

+#if defined(__APPLE__)
+#define st_atim st_atimespec
+#define st_ctim st_ctimespec
+#define st_mtim st_mtimespec
+#endif
+
//////////////////////
// TRAVERSE SESSION //
//////////////////////
18 changes: 18 additions & 0 deletions sysutils/rmlint/files/patch-universal.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--- SConstruct.orig 2020-06-13 17:42:45.000000000 +0800
+++ SConstruct 2022-06-01 18:56:53.000000000 +0800
@@ -686,6 +686,15 @@
else:
conf.env.Append(CCFLAGS=['-fPIC'])

+# Universal binaries support
+conf.env.Append(CCFLAGS=[
+ '-arch', '@ARCH@'
+])
+
+conf.env.Append(LINKFLAGS=[
+ '-arch', '@ARCH@'
+])
+
# check _mm_crc32_u64 (SSE4.2) support:
conf.check_mm_crc32_u64()