From nobody Mon Jul 24 19:19:39 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 4R8qjR5LS3z4pNr4; Mon, 24 Jul 2023 19:19:39 +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 4R8qjR4tH4z44ZR; Mon, 24 Jul 2023 19:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690226379; 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=6G8s2H7MXJyQeuNgAEETDdM82DDMHb10LsfOcVUkP1I=; b=L64JLeELdMQALU769T/VrxwuHi+O6euKpN2D3XHQBXlcRxdeb2qFagf+BWPW3wvMpRnR3b Bcm6n6qOdN6ugbJxl6n+h13OeP5Y+z2V4eEuuEMdE9rlKJYGMlqqBJxdmvxcrIRzD74Noy +AVcRERMwyxJaW4kxGdZLrmvLwtL3MNrPoI14oSm0yfEzJuN67O3gJ33ZOsHiIa4s7Mo2u GXaPj5XISMyhoBflScyknyfeSHS7U+HqBZeiyOP0oFVXbKkdDppKOYN9JlcF83tW671aXb eBTJg05/TBMLa+c+TdVWsXq7H3OM0C08I4OWoBMYoi/439+gFaYODmiDXllBNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690226379; 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=6G8s2H7MXJyQeuNgAEETDdM82DDMHb10LsfOcVUkP1I=; b=IXSg/ywHwNzXK3wv+GPmzYv8TF+MsU1botOthuzVUg6ZAdXEpt8RssauETdHuyUHZPqgVu xQZk8VX93+XqwSjbsMT/8cQGQOvLlQzHSOD6lB1oYpeHYuBIsu7Sie823CmueKNGQq2s++ mBK2+9TBWUq4CN5DOyEoNPc7otsj/XkenMhXgfz+osdL+q5Ss46F0WOUXB07X+BZR1eXnw Kv596qktlQj24F8Qj+6aqD+0Ie6T93ZMsHhvIT6/tiodxQ7MxFK+iAHIa1LBsWQ4UzZO8m xU3bZpYOuSlwTGRs7K6IYTYFgpMbbq4Fr4q4EoP+9x9UwSykiTg/xaXa7dMolw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690226379; a=rsa-sha256; cv=none; b=chOJVNfpC1Nj3o1/7yUIfEBfp6B9YgzbrR4ZG9SViltGqpEywK0T8qCMGwHgRpSmdNB9lR /QVXNbpTtVQO6AC9A/wUTSXti4jYhEmo1O12+dZl8Afm83y1Hv45lRVOEw7JBiD2Jn7JQQ 3WWW6/zHAtZvvzQoY7kY3dk1KIC++MXH5eGIDqd2WmSyQIk3SaqueLf77avAKJTDOiUrl6 7pF8Iag0E4nsqCBptvp/SAxFK0oniuDBVQEhLQ0RIW+T89F2ugAYGdwjXqO+6P2m8MiSpt kalxiZOTktsl4G/O57X3+Ej+CLbrPvxckQniqIlBJl1yfYXeZO3Ad1sdZFLQOg== 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 4R8qjR3xZTzVpT; Mon, 24 Jul 2023 19:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36OJJdZS028395; Mon, 24 Jul 2023 19:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OJJdNJ028394; Mon, 24 Jul 2023 19:19:39 GMT (envelope-from git) Date: Mon, 24 Jul 2023 19:19:39 GMT Message-Id: <202307241919.36OJJdNJ028394@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: f3743efb0f84 - main - graphics/osgearth: Unbreak build on arm64 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: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3743efb0f84b0f2a490329bb833fef60ec1216e Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3743efb0f84b0f2a490329bb833fef60ec1216e commit f3743efb0f84b0f2a490329bb833fef60ec1216e Author: Felix Palmen AuthorDate: 2023-07-24 19:09:46 +0000 Commit: Felix Palmen CommitDate: 2023-07-24 19:19:08 +0000 graphics/osgearth: Unbreak build on arm64 The build failed on arm64 for including llvm intrinsics headers for x86 architectures. The extra patch for i386 already modified the build not to use these intrinsics, so it solves the issue for arm64 as well. It is still needed on i386 because intrinsics requiring SSE are used. Therefore, rename the patch file to better describe the purpose and use it for any architecture except amd64 and powerpc64, the latter assuming the flags used for powerpc64 still work, which I cannot test myself. The result on architectures that built fine before is unchanged, therefore no revision bump is required. Reported by: pkg-fallout --- graphics/osgearth/Makefile | 7 +++---- .../osgearth/files/{extra-patch-i386 => extra-patch-no-ia32-sse} | 0 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index f78f6fa99b93..50643548f636 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -45,11 +45,10 @@ post-extract: CXXFLAGS+= -DNO_WARN_X86_INTRINSICS -maltivec -mvsx USES+= compiler:gcc-c++11-lib .else +. if ${ARCH} != amd64 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-no-ia32-sse +. endif USES+= compiler:c++11-lang .endif -.if ${ARCH} == i386 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-i386 -.endif - .include diff --git a/graphics/osgearth/files/extra-patch-i386 b/graphics/osgearth/files/extra-patch-no-ia32-sse similarity index 100% rename from graphics/osgearth/files/extra-patch-i386 rename to graphics/osgearth/files/extra-patch-no-ia32-sse