From nobody Mon Jan 6 23:08:20 2025 X-Original-To: dev-commits-ports-branches@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 4YRqbp5Dn6z5kNPX; Mon, 06 Jan 2025 23:08: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRqbn0WZjz4vt4; Mon, 6 Jan 2025 23:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204901; 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=HMsw9scwP9TWyZMkLN0kKWAAMf54Xz7tQUQFnSPUgOk=; b=rGylOQICH53dnYz6bYfOqqtIDHBfsJWDqIi31NYTKu+S37+DSd0sToNZhenY9TigeGKd7V HnAmEP2lo6fVkgLgSyELZacCHQREI6cup95J6aKc2CrsAUplJKudBmFt13ODq+9HJBpoos qWKKF/91gU595CapUCfDRVQkIJU27cCJ5w7m0Pp0W9ej/3rj6xvnKt23Y4TXdEXaFNXkEE MgypfmwuptlSXnAJFXkAoktgzjpiAQ3LNhJ5XUy8HjFHXwyGZ8tb0GZKPEZsp7XLteqTLB 7BPcPmGeWb6lZBS51Iyi7lx749KvqM9N5D0z3hwsqlPS8VARCzwuDInt/cfYTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736204901; 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=HMsw9scwP9TWyZMkLN0kKWAAMf54Xz7tQUQFnSPUgOk=; b=tz8uqiRJslzlDg6ogNLBc26XF7Y4gJQf6oycrfaZVjTlodD9MEiW6NxPZhhncW8vo5uSi7 dlmlIrHjmAoxVl78QuMDIwk1gh8Ww4EYh80ewaK7/+XE8tEiMo+F3Nbo0H+97QwyyotDdM TudCAMF6V4c/Wn/YGgjah5Vvfu0fghEluvePiKJzxyyFXdUAqEgmd1Vw56sTCyOovvXbCh L2F8fHFNbMpWw9AOty+uVgx0pkyxq5j6PkYD/YxFxNr5bnhzmTcaJINtbWa5PDElaETTqB 2e7u9JMdTylSjI6PTvWvU6iLrzOAGs/6pR9UsbgJFmahLtH7fAjbW0UKpNgQfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736204901; a=rsa-sha256; cv=none; b=STS/esX02CGyzJJVhsk/nv97SS7Mse2lvuZD+14hgf9rDS2/mQVC9cO8a2T2UJnRRYHAvb /FD1JOnzYkVix8EcKpRzRKZ4wOtQvgKZjiuGCRThIq6Sh8r45Sg8J+/ch1t4GM7dsCWo4p pvF9kJQlgJoGAoF257FluZZP7T0omc8tcsjTdguDhZowl+pMOdrMsFsBtp8wPTwHqsxfdc 7a1wS20zHAtAszI3IhW9p6W2kqmqf6coUHuKIFTEybbscQYGtLXGn0Y/EJs+Cw8/6+2imS sWVGPUGxvwCeItmC/NhiAaQDKMwbYoarDP3hU22eR7dMA3E1Zuf8IozTAAZbQg== 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 4YRqbm5HJMzl1B; Mon, 06 Jan 2025 23:08:20 +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 506N8KLh071051; Mon, 6 Jan 2025 23:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506N8KFh071048; Mon, 6 Jan 2025 23:08:20 GMT (envelope-from git) Date: Mon, 6 Jan 2025 23:08:20 GMT Message-Id: <202501062308.506N8KFh071048@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 17176071892c - 2025Q1 - devel/outcome: fix build on armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 17176071892ca70f60d685b378ed99135326ee5b Auto-Submitted: auto-generated The branch 2025Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=17176071892ca70f60d685b378ed99135326ee5b commit 17176071892ca70f60d685b378ed99135326ee5b Author: Robert Clausecker AuthorDate: 2025-01-04 11:24:38 +0000 Commit: Robert Clausecker CommitDate: 2025-01-06 23:08:00 +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 (cherry picked from commit 684e90ff96b5e2aba9eadb25298de1dcb54c6615) --- 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