From nobody Mon Jan 6 23:06:42 2025 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 4YRqYv12LJz5kN8M; Mon, 06 Jan 2025 23:06:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRqYv0Kxrz4tWW; Mon, 6 Jan 2025 23:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204803; 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=VcFZxpPOejXFvZOkhRUZ65kOwjaDg0XBbQXDhRcUIhw=; b=nP3x+Gk3IXsRj+d5HcHLAmAFI4cxJnXK+JwaKAYQuft87t4E6ke7le3e+zjNtQD2NHVCa1 hgPd2LvSCJvl+Aa3FncDEzeU8TIfBGp5CZ3VrjVZk+v7k+vJ7GdnDtX5qwXDQgWeTf9P8s r5QnJ6QgGTWkgmiJtnfnOEBr5J68PJehQu9fCFBdaDW6gx/VcDHrruNnqDKr2D29HVpFhr acqXKQ0H6hJkWO9RIEX+mwCd+yA0t5Ny72uiTeXVVqbHybt2t3TRa0gmUK+lRrVRJlWvEA agP94Nl2a7Aa0/1UnjK1n+/cLil5vJGOpPYAaTSVdl3a9Wd0wy7H/79rY8idfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204803; 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=VcFZxpPOejXFvZOkhRUZ65kOwjaDg0XBbQXDhRcUIhw=; b=LQyjZDMMsQ7SkB876L5WgypQqInWDj7upbv9aLyB39EtMkmkbkDCHdHgi6Qlp25YLoR6OH Sb4JYl4aWqzlTfmRJ6Dh0WgJRN8yfzI09HzG345wZ0aIO0D//+7nOESBrnEeb/WGiyQ6mj sL3kT5tDJGEczZCcFK+0nXVMtjvS9N8403VqwWqSTXNlKff8JF8KoBgWaFYQgzzYv9J00/ aB70yHNP5jdpOjuE5F3vzX+Hu5SxlnlckBzxYuwp8VblXAeWQX7znldU9li5gS8hicV8OU 16loMO9EhEFTYrJxQ6AYl5IHqg3KtAthI1unnAim/byTGx51YFOE+/mhJWhgIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736204803; a=rsa-sha256; cv=none; b=j+C1ixdviGAhC5Ik0awEyXk68KZYFkUZvWPjBOcq+5aJ/u40Q21h2apdp14Plb7StNsMKi na5+S+ZSLDFqn79n0r1xMgpNrDRYapYzH5lajTPD4cFAdPg15cQWCCV0zHVnaKxZHRSXI5 mhB1nNJyV2CDP8KI0JXxhfJWjh7MhcuklUX40fCuCHWd9xf7wJi6TjGYrdJhZTLieuXzhr 46EB85R6bP7R3P32NWIEm1DXNVEKHIYbq2grIlpc43W3wJKkf4iDnvpOyLGlS+bTP4P7zJ WYuOXNwPEYeX2yluqGitRlNe9ubItoWmMOnDF6uLwrJS3nF2yDQRxBNZ/0uugg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YRqYt6QwZzlHN; Mon, 06 Jan 2025 23:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 506N6g02069537; Mon, 6 Jan 2025 23:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506N6gSk069534; Mon, 6 Jan 2025 23:06:42 GMT (envelope-from git) Date: Mon, 6 Jan 2025 23:06:42 GMT Message-Id: <202501062306.506N6gSk069534@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 684e90ff96b5 - main - devel/outcome: fix build on armv7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 684e90ff96b5e2aba9eadb25298de1dcb54c6615 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=684e90ff96b5e2aba9eadb25298de1dcb54c6615 commit 684e90ff96b5e2aba9eadb25298de1dcb54c6615 Author: Robert Clausecker AuthorDate: 2025-01-04 11:24:38 +0000 Commit: Robert Clausecker CommitDate: 2025-01-06 23:06:06 +0000 devel/outcome: fix build on armv7 On ARM, section types are spelled with % instead of @ as @ is the comment characters. Approved by: yuri (maintainer) PR: 283840 MFH: 2025Q1 --- devel/outcome/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/devel/outcome/Makefile b/devel/outcome/Makefile index d6c9f407ef5e..0bf9531eabda 100644 --- a/devel/outcome/Makefile +++ b/devel/outcome/Makefile @@ -10,8 +10,6 @@ WWW= https://ned14.github.io/outcome/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/Licence.txt -BROKEN_armv7= fails to compile due to inline assembly, see https://github.com/ned14/outcome/issues/309 - BUILD_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib RUN_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib @@ -26,8 +24,14 @@ CMAKE_TESTING_ON= BUILD_TESTING OUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST CMAKE_ARGS= -Dquickcpplib_DIR=${LOCALBASE}/lib/cmake/quickcpplib NO_BUILD= yes -NO_ARCH= yes PORTSCOUT= limit:^.*[0-9]\.[0-9].* -.include +.include + +.if ${ARCH:Marmv?} +pre-configure: + ${FIND} ${WRKDIR} \( -name \*.hpp -o -name \*.h \) -exec ${REINPLACE_CMD} -e 's,@progbits,%progbits,' {} + +.endif + +.include