From nobody Fri Oct 22 12:09:19 2021 X-Original-To: dev-commits-ports-main@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 A47ED181E5EF; Fri, 22 Oct 2021 12:09:22 +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 4HbNSK2lr1z4S0h; Fri, 22 Oct 2021 12:09:21 +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 3CC8D649F; Fri, 22 Oct 2021 12:09:19 +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 19MC9J04099147; Fri, 22 Oct 2021 12:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MC9Jvu099146; Fri, 22 Oct 2021 12:09:19 GMT (envelope-from git) Date: Fri, 22 Oct 2021 12:09:19 GMT Message-Id: <202110221209.19MC9Jvu099146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 91a4c28de9dc - main - misc/bb: fix building on non-x86 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91a4c28de9dc90927ba0acc201c6c1577f4fde0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=91a4c28de9dc90927ba0acc201c6c1577f4fde0c commit 91a4c28de9dc90927ba0acc201c6c1577f4fde0c Author: Piotr Kubaj AuthorDate: 2021-10-22 11:42:44 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-22 11:42:44 +0000 misc/bb: fix building on non-x86 regparm is strictly i386, but clang allows it on amd64. Building on other architectures fails with: In file included from zoom.c:56: In file included from ./zoom.h:30: ./formulas.h:53:63: error: 'regparm' is not valid on this platform int (*calculate) (number_t, number_t, number_t, number_t) REGISTERS(3); ^ ~ ./config.h:42:38: note: expanded from macro 'REGISTERS' GCC builts in just fine. --- misc/bb/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/misc/bb/Makefile b/misc/bb/Makefile index 91a4fb01cfaa..e938b862d9ae 100644 --- a/misc/bb/Makefile +++ b/misc/bb/Makefile @@ -15,11 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libaa.so:graphics/aalib \ libmikmod.so:audio/libmikmod -BROKEN_aarch64= fails to build: regparm is not valid on this platform -BROKEN_armv6= fails to build: regparm is not valid on this platform -BROKEN_armv7= fails to build: regparm is not valid on this platform -BROKEN_riscv64= fails to build: regparm is not valid on this platform - GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/bb-1.3.0 PORTDOCS= README @@ -28,6 +23,12 @@ PLIST_FILES= bin/bb man/man1/bb.1.gz share/bb/bb.s3m share/bb/bb2.s3m \ OPTIONS_DEFINE= DOCS +.include + +.if ${ARCH} != amd64 && ${ARCH} != i386 +USES+= compiler:gcc-c++11-lib +.endif + pre-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -E -e "s@#include +@#include @g" \ -e 's, REGISTERS \(3\),,g'