From nobody Tue Apr 18 21:55:57 2023 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 4Q1Hmb1MfSz45kJg; Tue, 18 Apr 2023 21:55:59 +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 4Q1HmY6gnKz4Jm0; Tue, 18 Apr 2023 21:55:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854958; 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=DKiutsr2nzDxGVE12f4tEbEQSxXYqYRevzBW7I9BIUs=; b=rEBkPPSObYvlYvrSQdW55GQodo9P5dtK0IZoJ0sy8yFvm4co80uQI43E1ldXv3d7UJjdNj Y0PD6jaq57+mYy3URSZMVDtldWSjWyNEonKre5+e+lndL9RfH8Y5AsnKSATr8srtklQOQQ rrl49nzl6hP3chVwICQitxbIikhhJSVYL5JO4HoudaHF7yL3QwDG1VDCWNQoVmztOD7tdu bMjaUgmo7kTUCmY5GVRxnGG0FyFv1OKz09yJ+s34gYhxu5FP9V9LkLOxzKQcdTzOXElLPA hQ1EHrRxNdqtyT457hO8VswVMCWCMLmvR8Zaw5amim4uZ1zifh0TMrQwjHd1nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854958; 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=DKiutsr2nzDxGVE12f4tEbEQSxXYqYRevzBW7I9BIUs=; b=RDbHD9csmkZ+TpWdmWHRDJdjaWeJAjwzUdLvXkaf238NSs418id/TdeeiECRAwhDL89WTk gGGJlCOkPqZrznVSkITun9CNAiVi6aprbO9AJtGE3Sj9/lWHPzv0ZmkVmnl2VgRyfCO8kP fh03sm0LXOzmMiCrDCyrqppDppTPq4dGPyTdQE2js5+d/y4zb48MnI+8ZU5rwVsFWMPinI bY5vZ0Vwxqh7Qpy8rTjYk4pq/D9Q/kp2jb15ZciyUEJ2E8TUYQ1TRGe/bEavrs1Nr/143B CDIOmVFVyGFodQQF+7oo28wbRa0QTW+ZYewXzgTGxT/qe88/7iVk7nqr1t4wsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854958; a=rsa-sha256; cv=none; b=JYF4zpQSGnLTvZyHqfoMgs4lWMQ5pmZp677AfeA5F+T+T5Qg23xbfEfdFLwM8AM5YYTtIS /j/iB+c/1Ivt3hxGBuuzXwicYq6ZGbWl5eDPHM+xOOfwnPhOv2uoq6yR9taaNYEwn23oQg YWHkks1Lccm0d6OiBxUZHuYK48o+aNUIB5QXvGnFCX53Y9XXXCOD+7xL0W0EMhuavPNC4t oTxWyjmvHNHIGaP/8nq0bcuqKj4RaTJEMq0kSij7fg8hfu70DHxMc1u6ietY24MO2zozXX v2hXBWsSrZyH5Hd6W5bKP+S5dVRf7bhmRCrSPIXU8NmJM2WT0nJx1rEwv5UyBw== 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 4Q1HmY2bGyzTrx; Tue, 18 Apr 2023 21:55:57 +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 33ILtvog062750; Tue, 18 Apr 2023 21:55:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILtvTa062749; Tue, 18 Apr 2023 21:55:57 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:55:57 GMT Message-Id: <202304182155.33ILtvTa062749@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: d422cb7e4a2a - main - math/symfpu: fix build 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d422cb7e4a2a459719a4c4e1b28c0ee4416e4765 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d422cb7e4a2a459719a4c4e1b28c0ee4416e4765 commit d422cb7e4a2a459719a4c4e1b28c0ee4416e4765 Author: Robert Clausecker AuthorDate: 2023-04-17 21:51:52 +0000 Commit: Robert Clausecker CommitDate: 2023-04-18 21:55:30 +0000 math/symfpu: fix build on non-x86 Only supply x86-specific CXXFLAGS on i386 and amd64. Approved by: portmgr (build fix blanket) --- math/symfpu/Makefile | 9 ++++++--- math/symfpu/files/patch-flags | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/math/symfpu/Makefile b/math/symfpu/Makefile index c3a04d80a98f..0823dff67a16 100644 --- a/math/symfpu/Makefile +++ b/math/symfpu/Makefile @@ -15,12 +15,15 @@ USE_GITHUB= yes GH_ACCOUNT= martin-cs GH_TAGNAME= c3acaf6 -CXXFLAGS+= -I${WRKSRC} - ALL_TARGET= subdirs symfpu.a - MAKE_ARGS= SUBDIRS=baseTypes +# these flags are x86-only and have been patched out +# of ${WRKSRC}/flags for portability +CXXFLAGS_amd64= -msse -mfma -mno-fma4 -mfpmath=sse +CXXFLAGS_i386= ${CXXFLAGS_amd64} +CXXFLAGS+= ${CXXFLAGS_${ARCH}} -I${WRKSRC} + do-install: ${MKDIR} \ ${STAGEDIR}${PREFIX}/include/symfpu/core \ diff --git a/math/symfpu/files/patch-flags b/math/symfpu/files/patch-flags new file mode 100644 index 000000000000..404a3e9f2053 --- /dev/null +++ b/math/symfpu/files/patch-flags @@ -0,0 +1,5 @@ +--- flags.orig 2023-04-17 21:44:48 UTC ++++ flags +@@ -1 +1 @@ +-CXXFLAGS+=-std=gnu++11 -Wall -W -frounding-math -fsignaling-nans -ffp-contract=off -msse2 -mfpmath=sse -pedantic -mfma -mno-fma4 ++CXXFLAGS+=-std=gnu++11 -Wall -W -frounding-math -fsignaling-nans -ffp-contract=off -pedantic