From nobody Thu Dec 02 15:39:24 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 1C02018BF0D1; Thu, 2 Dec 2021 15:39:25 +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 4J4g9m63cvz3n25; Thu, 2 Dec 2021 15:39:24 +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 ACE1F1FB41; Thu, 2 Dec 2021 15:39:24 +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 1B2FdOoT015757; Thu, 2 Dec 2021 15:39:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2FdOHU015756; Thu, 2 Dec 2021 15:39:24 GMT (envelope-from git) Date: Thu, 2 Dec 2021 15:39:24 GMT Message-Id: <202112021539.1B2FdOHU015756@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: d0c02411acb6 - main - graphics/tesseract: fix build on non-x86 non-arm 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: d0c02411acb689db9a692dad593867b25f15b281 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638459564; 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=olU8Uv6krVn6pOYFpTAMmtcvM4E1SKbFuTI4jpJ8HVc=; b=u/+nLasxmTu3M+OwBod583MGgWYwhGKWbPRTRkuIJfgdh2XaAfc/fwAzfSSbuLP9OiM9Qd ACaEPRbedI/R8d2h+aiB5m716XgNfrJsyARRa+MH4Q+9NyIBSA3srzpAtsIa0xrqe2Hm2o Y6nzE8fatDFD/axMBusUUxj1Qt8FCPqUqndBa3fidlj+SwBFaXBFKeaf5EQabRmQad6dei Ui9hbQi3ne6xemsrQD/hXYkeW3HfpbvxzVpuzpnlaTOI+1rDrNgjJ9nebN73C08j0J8kZ6 vLvPN3Djz8nOlbEMzXM+iXr4gF0D0vk3EceLvS7FCvin/V+L4jSmBqv1/Uudkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638459564; a=rsa-sha256; cv=none; b=XT2l/KTO1qLX1bGZzMUNYgNBNicFSxEHM767G0Vq3KkJY0hBJMMeoKYW2zpyw3YoI1Ut8M cG321LakKEaSYvJXLJgS2fZquYh6LwdjrW8CPTwCFhQ3QzXTeB19P4QaLygXKs78OSFz/y +yjIdAjIed+hQe5SgqccMcR2M1hO8erwyxYB5GKcZ3dt//QZ/m0KGtPlx0E6noPp08kzt3 YfVFAg9QK4HCbEEJBogzIkGrTFQax8E3X6J+OR90B7kW+MNilmwJs+noqAD8eDYIehIKZH 2XMf6nuZXrdeuYvehHcxPOIOnoJlRCleg4VJIGi/BdSEdEOj6k9l/8ExHYrubw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0c02411acb689db9a692dad593867b25f15b281 commit d0c02411acb689db9a692dad593867b25f15b281 Author: Piotr Kubaj AuthorDate: 2021-12-02 15:32:40 +0000 Commit: Piotr Kubaj CommitDate: 2021-12-02 15:32:40 +0000 graphics/tesseract: fix build on non-x86 non-arm Clang doesn't exit with error on powerpc64* after adding -mfpu=neon, but merely ignores the argument and prints a warning, which incorrectly makes it defined as ARM with NEON. --- graphics/tesseract/files/patch-CMakeLists.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/graphics/tesseract/files/patch-CMakeLists.txt b/graphics/tesseract/files/patch-CMakeLists.txt index 88cfa19b6ebb..1bddd1caeb1a 100644 --- a/graphics/tesseract/files/patch-CMakeLists.txt +++ b/graphics/tesseract/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-12-01 16:27:45 UTC +--- CMakeLists.txt.orig 2021-12-02 15:06:37 UTC +++ CMakeLists.txt @@ -149,7 +149,7 @@ endif() @@ -9,3 +9,27 @@ set(HAVE_NEON FALSE) +@@ -220,7 +220,7 @@ set(HAVE_SSE4_1 FALSE) + add_definitions("-DHAVE_NEON") + set(HAVE_NEON TRUE) + +-else() ++elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") + + set(HAVE_AVX FALSE) + set(HAVE_AVX2 FALSE) +@@ -232,6 +232,14 @@ if(HAVE_NEON) + set(NEON_COMPILE_FLAGS "-mfpu=neon") + add_definitions("-DHAVE_NEON") + endif() ++ ++else() ++ ++set(HAVE_AVX FALSE) ++set(HAVE_AVX2 FALSE) ++set(HAVE_FMA FALSE) ++set(HAVE_NEON FALSE) ++set(HAVE_SSE4_1 FALSE) + + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|AMD64") +