From nobody Thu Dec 26 10:47:10 2024 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 4YJlgg2d5Rz5hgYd; Thu, 26 Dec 2024 10:47:11 +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 4YJlgg0jmrz4755; Thu, 26 Dec 2024 10:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210031; 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=+1wF+IiQ6BXK4fVeVqM7Vkm3ztHyoZQd0AXVVPCipck=; b=izwVwLRW3cqTeUmp0mj3MDDMepJeVNIhNBy6RmwbYpj5YhJ6lb3kBbKh6hJeNyNHOHkqwV +zGBiS7sQrTpuWJsionI4rfg5YTw9or2fQih0U/ySO4fJF+jU2B2DvmPuHjgsYOmdnYN3G 0QzHjyKKDoF32wESZoJQUQMZi3FqWKOyoERgjTodYB4l1ChdM66a6NT8k/8KWQSzBWcn/y 3JkZHvBBomfcvaFkV5ZrVwkiXSRmhv2f9JZr6nMGj711wZPzRotV3ShWS5+ArbdwiulYej S2rjRE2UQWQ5771N+oyf5mnCWUfFWB/aFyGjRnHoXctQsPQ8hEYmPWq4rOzTuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210031; 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=+1wF+IiQ6BXK4fVeVqM7Vkm3ztHyoZQd0AXVVPCipck=; b=lRNcWlZ9jqHDjRRbknfY6JmLOP/yCCEUQtEou4y17Sk3cHSFEcAmI8JjvzoTfzaGtUk58q e6iIULSG6u+Ozy4r5aBRQzyWhKpeF3UBygXmwVePK/F6DzuLcci12OiEER80vUuY8cMHvk zEhvSIsLrcRj9z/fIya19faSFZFk5rzFHJ47/Z0UVppQifzEBaqWt+4MMjrouS7Q4f2jrL I1SXmeAqH8GKHmZJc+LqVZTURjqbhF+kHjWM0HlIAAGHmnzp5l1BfprBoS3phgnGkinczZ wpbVS6sE8WtMwQDI5+SXBYatWCSFKuDcAp7yUHXx5VgHejMZHOHwYw8BElSs5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735210031; a=rsa-sha256; cv=none; b=PQv71xaWX6ZJ6QxmaFizdeK1Iuc8pv6DLddTt+tDfAeOCrAOm9JouxfFJq5158hCq9vdfI pLfH+6Blo2/TXDns2b52tfFwhvAv/caKQ8rS90cJ23f5GXD0BUOpGIQwX8SZzfJXiZQTio joq6BkgQKOFsfHsFBL7xhMapgJn8BmXlhiJTvBhyvQIAe2uPEd90ezLa3ADRZarqFiyXsD MMLBKGo/nzGhIcyUns9b2sAmzMbKibpDqHswGRUSIXSkbh6c2f/1lFO7+8Au6JSxFa9cIc 4ZCXktWTo4u/hAe8RNOMfiCmsZ68wjYZlRB5RswEcBqO1NorziWq3v5f5qmJeQ== 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 4YJlgg0JxBzrHY; Thu, 26 Dec 2024 10:47:11 +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 4BQAlATv039548; Thu, 26 Dec 2024 10:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQAlAcv039545; Thu, 26 Dec 2024 10:47:10 GMT (envelope-from git) Date: Thu, 26 Dec 2024 10:47:10 GMT Message-Id: <202412261047.4BQAlAcv039545@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: 708581049626 - main - math/cminpack: fix plist on armv7 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 7085810496269c2d2b6ab30e4dc37a8eaae521ac Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7085810496269c2d2b6ab30e4dc37a8eaae521ac commit 7085810496269c2d2b6ab30e4dc37a8eaae521ac Author: Robert Clausecker AuthorDate: 2024-12-25 09:32:45 +0000 Commit: Robert Clausecker CommitDate: 2024-12-26 10:46:29 +0000 math/cminpack: fix plist on armv7 Same error as on powerpc. Add some explanation as to what is going on. Approved by: portmgr (build fix blanket) MFH: 2024Q4 --- math/cminpack/Makefile | 8 +++++--- math/cminpack/pkg-plist | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/math/cminpack/Makefile b/math/cminpack/Makefile index 60579256c075..757f75477b79 100644 --- a/math/cminpack/Makefile +++ b/math/cminpack/Makefile @@ -21,10 +21,12 @@ OPTIONS_DEFINE= EXAMPLES .include -.if ${ARCH:Mpowerpc*} -PLIST_SUB+= NOT_POWERPC="@comment " +# libcminpackld is only built on platforms where +# sizeof(long double) > sizeof(double) +.if ${ARCH:Mpowerpc*} || ${ARCH:Marmv?} +PLIST_SUB+= LONG_DOUBLE="@comment " .else -PLIST_SUB+= NOT_POWERPC="" +PLIST_SUB+= LONG_DOUBLE="" .endif diff --git a/math/cminpack/pkg-plist b/math/cminpack/pkg-plist index 43939cff49b5..1f673e80c0a3 100644 --- a/math/cminpack/pkg-plist +++ b/math/cminpack/pkg-plist @@ -3,14 +3,14 @@ include/cminpack-1/minpack.h lib/libcminpack.so lib/libcminpack.so.1 lib/libcminpack.so.1.3.11 -%%NOT_POWERPC%%lib/libcminpackld.so -%%NOT_POWERPC%%lib/libcminpackld.so.1 -%%NOT_POWERPC%%lib/libcminpackld.so.1.3.11 +%%LONG_DOUBLE%%lib/libcminpackld.so +%%LONG_DOUBLE%%lib/libcminpackld.so.1 +%%LONG_DOUBLE%%lib/libcminpackld.so.1.3.11 lib/libcminpacks.so lib/libcminpacks.so.1 lib/libcminpacks.so.1.3.11 libdata/pkgconfig/cminpack.pc -%%NOT_POWERPC%%libdata/pkgconfig/cminpackld.pc +%%LONG_DOUBLE%%libdata/pkgconfig/cminpackld.pc libdata/pkgconfig/cminpacks.pc %%DATADIR%%/CMinpackConfig-%%CMAKE_BUILD_TYPE%%.cmake %%DATADIR%%/CMinpackConfig.cmake