From nobody Thu Dec 26 10:49:04 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 4YJljs1HjNz5hh0G; Thu, 26 Dec 2024 10:49:05 +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 4YJljr6nDvz47rS; Thu, 26 Dec 2024 10:49:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210144; 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=O28kAz01rWA9sw/x0kmOQZXwJWVwr3Vj7IJh/8aNmYA=; b=xbvRlm9O9kXbRcG77ozbS9Y9lSkPSoc+qzhYzvRQgHhSAlDLXxWEJlu9awAhjEc+sn228Y lOoEHAtgD7HUnVc7ErgFdgL9hQvW/SQh6eEhEXl7FMgmGrQvLlJNPEZi9lK27nEjd69/7S URelngrgphe19mbM3aQo6FbrRus+Se045bsWhv98NyPsatZOPBwc8JUgxhupdRJzDZiYpD nmkjvdMXVnGZEw2+mLW9n8gOlwL7t9CCcgbH9bwc5XxLsYgmHNQr03P47UGSHNmneHaxbt bCa0foPnezqatFUiD77bqXkOfuLw9XAIepXH04L7tN1x3mm7bQQEniBCBQP+qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210144; 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=O28kAz01rWA9sw/x0kmOQZXwJWVwr3Vj7IJh/8aNmYA=; b=MsWtWIjF0y64pqm2q99macXhiDPX9ZN5FE+0iJCK5fRIBxMLjLSSdoydM8guBYbY8fHoS/ ndnjE49T3dA3pR3LOpszHXhsGmD7lYg8OLlQmm1NTiyhHHZUcGNClRoXfmiV35wyz9ALNW gCfC7W5F2Q7FPaSJi4QY3ooKJxjQr4mOu3a7cjgHTolIvBx0cg04vbZYVs15E1j3+Ozy/G kk58SqQp6YXbiD2VJ5HWl78f+CIz2asf6Mc1r/lEIUSJ9Ubvyl0PXLFqO8m/nzmBChrcAy RS/WI1Le3SvVxuoalxQVD88CWb9PAOd3JntgtAJwKpX9I6lqzhI5MsqlRHv8ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735210144; a=rsa-sha256; cv=none; b=O7fitX/V0Pe6RZ18DZEFDKecwuHWaKtk2TB142SzTf8Cu4C44/sBxuKnpQyWF6fsFX/NtU TLNyD91L1dUzvl0zfRYugEvSly8A1OXZwUNfUmUUdjbYjYbS3mlGSXKyENeIPvD7M5HSwD rCw53dQWQcud+sKSCCKEtkd48shOCHr98DPNJNWoUNJAX5Px6aHaByuCH29LewiLuJjEIz r4/ywleUd2+nRORr4cmdGjp2eoUIoClAgKCUrTHTk8aE+ts8WOLo4WXdQ0pizjxVD1YJYc snPoUNWzbmhrevNLagf0NNWa4f+4Q+W7kn3/eFVqfcGTtxHM8n9yiowq0ngXSw== 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 4YJljr5q6pzr0f; Thu, 26 Dec 2024 10:49:04 +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 4BQAn4lM040505; Thu, 26 Dec 2024 10:49:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQAn4Z8040502; Thu, 26 Dec 2024 10:49:04 GMT (envelope-from git) Date: Thu, 26 Dec 2024 10:49:04 GMT Message-Id: <202412261049.4BQAn4Z8040502@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: e1b7215897c0 - 2024Q4 - 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: e1b7215897c06a5a0837d7fcc51e118e94afa021 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1b7215897c06a5a0837d7fcc51e118e94afa021 commit e1b7215897c06a5a0837d7fcc51e118e94afa021 Author: Robert Clausecker AuthorDate: 2024-12-25 09:32:45 +0000 Commit: Robert Clausecker CommitDate: 2024-12-26 10:48:41 +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 (cherry picked from commit 7085810496269c2d2b6ab30e4dc37a8eaae521ac) --- 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