git: 28dd25825b46 - main - sysutils/cdrdao: stab at fixing on riscv
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 20 Dec 2021 22:11:06 UTC
The branch main has been updated by marius:
URL: https://cgit.FreeBSD.org/ports/commit/?id=28dd25825b464d9e4d9e0b640606dacb33dc630f
commit 28dd25825b464d9e4d9e0b640606dacb33dc630f
Author: Marius Strobl <marius@FreeBSD.org>
AuthorDate: 2021-12-20 22:06:50 +0000
Commit: Marius Strobl <marius@FreeBSD.org>
CommitDate: 2021-12-20 22:10:53 +0000
sysutils/cdrdao: stab at fixing on riscv
---
sysutils/cdrdao/Makefile | 2 --
sysutils/cdrdao/files/patch-scsilib_include_mconfig.h | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index b3aeb5f6c8da..2511930d2e38 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -12,8 +12,6 @@ COMMENT?= Record CD-R[W]s in disk-at-once mode
LICENSE= GPLv2
-BROKEN_riscv64= ../include/mconfig.h:86:2: error: Architecture not defined here
-
USES= alias compiler:c++11-lang gmake tar:bzip2
GNU_CONFIGURE= yes
USE_CXXSTD= c++11
diff --git a/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h b/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
index 7cffd970716b..7e83c7f8023b 100644
--- a/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
+++ b/sysutils/cdrdao/files/patch-scsilib_include_mconfig.h
@@ -5,13 +5,13 @@
*/
-#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__)
-+#if defined(__aarch64__) || defined(__ia64__) || defined(__mips_n64) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__)
++#if defined(__aarch64__) || defined(__ia64__) || defined(__mips_n64) || defined(__powerpc64__) || (defined(__riscv) && (__riscv_xlen == 64)) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__)
#define SIZEOF_LONG_INT 8
#define SIZEOF_CHAR_P 8
#define SIZEOF_UNSIGNED_LONG_INT 8
#define SIZEOF_UNSIGNED_CHAR_P 8
-#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
-+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) || defined(__powerpc__) || (defined(__riscv) && (__riscv_xlen == 32)) || defined(__s390__) || defined(__sparc__)
#define SIZEOF_LONG_INT 4
#define SIZEOF_CHAR_P 4
#define SIZEOF_UNSIGNED_LONG_INT 4