From nobody Mon Dec 20 22:11:06 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1FF85190D9DC; Mon, 20 Dec 2021 22:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JHv1Q6H8Dz3NdB; Mon, 20 Dec 2021 22:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B86C01DF47; Mon, 20 Dec 2021 22:11:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BKMB6Mw093674; Mon, 20 Dec 2021 22:11:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BKMB6Fn093673; Mon, 20 Dec 2021 22:11:06 GMT (envelope-from git) Date: Mon, 20 Dec 2021 22:11:06 GMT Message-Id: <202112202211.1BKMB6Fn093673@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Marius Strobl Subject: git: 28dd25825b46 - main - sysutils/cdrdao: stab at fixing on riscv List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28dd25825b464d9e4d9e0b640606dacb33dc630f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640038266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=333ICASVjjDuqrbZu6/IZfsvomVTZIN/b0XQz1RbamY=; b=eLeM7ve4fv8O39OCqtbh7+pbhUwuaVpTFsDOmrHNv0CDf/kIK4mQ5yu2M4ZXZA17ooTOOc 4OcVnH0nCxMFWoTUAi+JZVdbdJ69/+sFIQ/Y1SjCslV3YCB4x8SYaFhHG+2DlfmCkjEk2u JYP9pa3OVWHZjEkPl+lC6qnm6v/RGaMSocaVOoqZSR5ay7fk4KkuHdx89XGqEOGwZs4gBi JOcIw2JKk/ga8yQuAG6pj7jp47x96kwB+ukgv/nv7BhXwuXp0INvSIfVMxMdmHqT0H198Z gP5xPEbZmTGDeD4Qdxu8Lu3p3awlfY99kATbwIvHSyy31RduNKkb+tPAZu9MiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640038266; a=rsa-sha256; cv=none; b=fofa91aZmPpgtU61RD5IgcJjZfsv3YiOGldHFkVTvZmIIrLllf5h68KCrGwQpg5VgoMWee uS0GFGjiRW36XjVYlQmB2mcqz6p57e47FV/CtOLI0wkRNW6qEeRoJojL/qoVNazdlbsm9C VkBGVJe27iYXlIINBBgwMHOje5CirCvKD3KVBdJvQ/EYHQnZfrPaTs/EqmZmzmK55wKPzL /o0orLe75cqFEUPdextD6ZCB781pD6JoA78pnD+1cIm143pDL2iZWqZYiQ+m66N2DjLCJi LxxCx4CHOALn1vPCX99iF4MjQT8y2Ih3n3MnEnWdkOgMW0k++DtOo7jWbwho8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/ports/commit/?id=28dd25825b464d9e4d9e0b640606dacb33dc630f commit 28dd25825b464d9e4d9e0b640606dacb33dc630f Author: Marius Strobl AuthorDate: 2021-12-20 22:06:50 +0000 Commit: Marius Strobl 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