Re: [PR PATCH] [Updated] scanmem: fix cross-build

[ndowens <ndowens@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages scanmem
https://github.com/void-linux/void-packages/pull/27590

scanmem: fix cross-build


A patch file from https://github.com/void-linux/void-packages/pull/27590.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-scanmem-27590.patch --]
[-- Type: text/x-diff, Size: 3113 bytes --]

From e8e6a888bd2e640d57114842a4d2eec79bdc3dc6 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Thu, 31 Dec 2020 20:27:21 -0600
Subject: [PATCH] scanmem: fix cross-build

---
 srcpkgs/scanmem/patches/0001-fix-cross.patch  | 32 +++++++++++++++++++
 srcpkgs/scanmem/patches/0003--musl-test.patch | 25 +++++++++++++++
 srcpkgs/scanmem/template                      |  2 --
 3 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/scanmem/patches/0001-fix-cross.patch
 create mode 100644 srcpkgs/scanmem/patches/0003--musl-test.patch

diff --git a/srcpkgs/scanmem/patches/0001-fix-cross.patch b/srcpkgs/scanmem/patches/0001-fix-cross.patch
new file mode 100644
index 00000000000..a131f9a45fb
--- /dev/null
+++ b/srcpkgs/scanmem/patches/0001-fix-cross.patch
@@ -0,0 +1,32 @@
+From af8bcb8e21ac7f9b97508d6326acd7b1f12982b0 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 31 Dec 2020 20:25:35 -0600
+Subject: [PATCH] fix cross
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git configure.ac configure.ac
+index 5b8bac3..6cca18f 100644
+--- configure.ac
++++ configure.ac
+@@ -60,13 +60,13 @@ esac
+ 
+ AS_IF([test "x$android" = "xno"], [
+   # also need to check if the file is zero'ed (some hardened systems)
+-  AC_CHECK_FILE([/proc/self/maps], [], [
++  AS_IF([test -f/proc/self/maps], [], [
+     echo "This system does not seem to have /proc/pid/maps files."
+     exit 1
+   ])
+ 
+   # also need to check this file works
+-  AC_CHECK_FILE([/proc/self/mem], [
++  AS_IF([test -f /proc/self/mem], [
+     # LARGEFILE support required for this to work
+     AC_SYS_LARGEFILE
+     AC_DEFINE(HAVE_PROCMEM, [1], [Enable /proc/pid/mem support])
+-- 
+2.30.0
+
diff --git a/srcpkgs/scanmem/patches/0003--musl-test.patch b/srcpkgs/scanmem/patches/0003--musl-test.patch
new file mode 100644
index 00000000000..2187df5cd8a
--- /dev/null
+++ b/srcpkgs/scanmem/patches/0003--musl-test.patch
@@ -0,0 +1,25 @@
+From 6252f9c2639b6e25af19df7c3b06376fb6e101b6 Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens@artixlinux.org>
+Date: Thu, 31 Dec 2020 20:36:49 -0600
+Subject: [PATCH] musl test
+
+---
+ test/memfake.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git test/memfake.c test/memfake.c
+index 1c4fa94..bf7f319 100644
+--- test/memfake.c
++++ test/memfake.c
+@@ -25,7 +25,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    uint MB_to_allocate = 1;
++    unsigned int MB_to_allocate = 1;
+     bool add_randomness = false;
+ 
+     if (argc >= 2) MB_to_allocate = atoi(argv[1]);
+-- 
+2.30.0
+
diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template
index d694f33d372..2db4f01e297 100644
--- a/srcpkgs/scanmem/template
+++ b/srcpkgs/scanmem/template
@@ -14,8 +14,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
 checksum=f02054b91322cf41517506158fcb74554e9fc6644e696f8aa25e5acf162d374b
 CFLAGS="-D__NEED_pid_t"
 
-nocross="checking for /proc/self/maps... configure: error"
-
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }