From nobody Tue Feb 21 20:31:56 2023 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 4PLrYS3vLjz3tBn3; Tue, 21 Feb 2023 20:31:56 +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 4PLrYS37y3z47Ct; Tue, 21 Feb 2023 20:31:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677011516; 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=5pcyz+uMPqGH+Z3m1KS67MeMB6EohRntVZiSq6kTIr4=; b=afUPsVbqhqrl3I3gz05r4Wq8mzzciWwun/8fDuZec8yEXxmvZCauXboi3UvlLFYE6WuPwc hnSABUPNLjrG2hzNY3uiUf/3pwZT9+4SMTZp8Iv+kcmnOwsFsruUA2XKbpJus5LZ8GPQ1D +yS55FEisx2Wr8bAfpaIFYUwr97WIF24Dzu4N1n91c7f3wpu9C7UrXCkvopIFKfVtTvCGf NSkrkONN0GnqsCOk2fFW94RSurJM/T3AN4J3wz2n6kHJIx+dQiYk+AyMACdFfYtqxLz4N9 3/0ckiKr+DM/y3K32+n45ncvGweC5OPGAaDQoo0e+b4UK2wPqFW/jeaEBkFroA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677011516; 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=5pcyz+uMPqGH+Z3m1KS67MeMB6EohRntVZiSq6kTIr4=; b=FvG1NRTOlCl5CwOBgCKNEOgfe+Gh/xbpsOCBx4+MBpo0lZRzK65gO7dAUb97Zv/6/u6lQY 4OVFYO6jSN7r26w6jS/mKNxiqyUoG3mag0V9iR/tLDT+RC52dqwsyIeb8Vy2Xy1q2Za4sL 689IVCIOX9FxK1ZYuk/9+3sWCumaXu73xH/p6IDFFp+jUSVBgz3mXB74NVvjiRbtD/iJ2M ZzIs5vZbR/NTNU6LouzzBLjW3f2DTjVHNSuErHuDZsZbmBbszsu7zTp9x3A4JZgitF/uge eEkz8A0l+nK/YW2P0A832LL7Fm33iHosQD5+JsCGwfepdQETx+CiHzhwbpEPyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677011516; a=rsa-sha256; cv=none; b=sj7SLYNYzVXiJd1pdlWFLNFHy4/3f+vG3CqYYjLRfUm5m3LPUkGhe6BTM3ButkuiI92AEa Htiy2CcsyxiTw8vGVlYZ7dWdj2D8jDekB/OtJnfVGg30fYPQcfhjHbTA7cuDTlUEAxxaGt PKAXRpT4MQzwFA/DhckRBviIkZ7/FfdURTR5nLvHAANSoWAXaFAXVnq20c/5kA9JXRUAgo r1wQRi3J9ik5KePyIAPTLooUzEz+CgVcx87nvrrtOaykrF6keR3xog3fhh4MOcIHYcjKhz YZc01oULKdCTO27ITYLK6qrm3Y8VlhVLGFT+WneJEHtDwF78Jdo7OPQL8mvKsw== 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 4PLrYS2CZVzYVl; Tue, 21 Feb 2023 20:31:56 +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 31LKVuL5081147; Tue, 21 Feb 2023 20:31:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LKVuhY081146; Tue, 21 Feb 2023 20:31:56 GMT (envelope-from git) Date: Tue, 21 Feb 2023 20:31:56 GMT Message-Id: <202302212031.31LKVuhY081146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: fefa4a2944e6 - main - cad/kicad: fix clang options on 32bit platforms 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fefa4a2944e6c3a0d1072291c8b1489c08dff530 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fefa4a2944e6c3a0d1072291c8b1489c08dff530 commit fefa4a2944e6c3a0d1072291c8b1489c08dff530 Author: Christoph Moench-Tegeder AuthorDate: 2023-02-21 20:30:04 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-02-21 20:30:04 +0000 cad/kicad: fix clang options on 32bit platforms The -ffloat-store option exists on gcc only, so do not add it to the clang command line. --- cad/kicad/files/patch-CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/cad/kicad/files/patch-CMakeLists.txt b/cad/kicad/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..555276a0bd83 --- /dev/null +++ b/cad/kicad/files/patch-CMakeLists.txt @@ -0,0 +1,40 @@ +commit 46a59aa2c3e23aa5dd5243e697eb29f8da680e03 +Author: Christoph Moench-Tegeder +Date: Tue Feb 21 20:45:27 2023 +0100 + + CMakeLists.txt: do not use -ffloat-store on clang + + According to it's User Manual, clang does not know about -ffloat-store. + This is corrobated by the FreeBSD i386 build (using LLVM 13 and 15, + depending on the base system version) failing early with an error + message complaining about this parameter being unknown. + + See + https://pkg-status.freebsd.org/beefy17/data/main-i386-default/pb27279cba1ca_sed03776ca7/logs/kicad-7.0.0,2.log + for an example of the failure, and + https://clang.llvm.org/docs/UsersManual.html#controlling-floating-point-behavior + for the available floating point options on clang. + +diff --git CMakeLists.txt CMakeLists.txt +index 47dff66be0..20239b4f09 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -365,12 +365,16 @@ endif(USE_DISTCC) + # Set flags for GCC, or treat llvm as GCC + #================================================ + +-if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) +- ++if( CMAKE_COMPILER_IS_GNUCXX ) + # Set 32-bit flag for GCC to prevent excess precision ++ # clang des not know this flag, so keep this separate + if( CMAKE_SIZEOF_VOID_P EQUAL 4 ) + set( CMAKE_CXX_FLAGS "-ffloat-store ${CMAKE_CXX_FLAGS}" ) + endif() ++endif( CMAKE_COMPILER_IS_GNUCXX ) ++ ++ ++if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + + # Link flags in Debug: -g1 and -ggdb1 or -g1 and -ggdb3 can be used. + # Level 1 produces minimal information, enough for making basic backtraces.