From nobody Thu Oct 24 10:44:52 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 4XZ2c43BxMz5bL9H; Thu, 24 Oct 2024 10:44:52 +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 4XZ2c42c0Nz4s44; Thu, 24 Oct 2024 10:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766692; 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=UJ+QVCtSy63lllUO2SGe8EYGfETq5sLd3DDbze0TBUw=; b=AN/K2eFW3uWrMACl9Rz+Ldh81dquRgBLogqaeqrn71UGIH1inDCv/LrEE8BctueqWLUiVY k5xj5sYd4LlA5Q1IfB3JYNF+u/4c4wfdC84CMUgVPuI3y9pqWZjkjQVO9Bi6NvyEPeUp6c VhmVaQO0cvzP3TaFRZMH0Ngka/6U6Qy5kVhgspDjpCuRS1ilA+mJWbvMNmzkR+3J27hRjY 1ldW94r4x5+Wi9oDa243ld8OhNSigzyMcMgRlRy9BvxUnx4Qkpv0u+I0uyPjReEoCZIwBx 4E3a1uw2TyG26JPefu/FVE4d2Pv6qEd1obCmiKiP9TOFnFsLfGvWFKarXmwPNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729766692; 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=UJ+QVCtSy63lllUO2SGe8EYGfETq5sLd3DDbze0TBUw=; b=FRdzgaiwG8yzdLmQGb4VIqjEsdm74Y/cWesSZ90vEEif/KzMX1rrIM669V9d+V+4MhKdNI fHi2ARDxhk+yu0LFRJrHZZH3TTAtPkszhkL1Auyr4OU7jaR1N0Gohdt41BNKEAUVncooDk pmbWwd6UblVZL7dEyt2fyyB0TMXbyIchcTkvi+FZkg4o2PNfeMfu6z+7O82fr9H5ErcYqF s95ienTlSbvvKslmGyNvx/PCfnJdcLfHyIJS/JrD8UhKkcj4ClY8jDdJCgL+JI432rMFcW E9VazVATQKQOvNytLWalDkO1qRNv7pDKfzP4Ct2ds7+3tC6CR89gC9+WcX5MUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729766692; a=rsa-sha256; cv=none; b=MwDwKEhGh2+PKz881QaNrshbBzhS/TpieV5X4eRW/b0T0sDAStXiUYLZwLGFfg//KggYSF SNbRyWU1+5RPviPmAybP6lQJFdtqqn2FZ9VnpQoZIYWUxhWt2TYzMATxm34PRC/kLzNBpk 3/mOCIxA29oUaFEUMMPmG8Ww+R2/Dgl7FJwYJbUk8IJedfgslN8mIEdJ/1RydPAmNNsnpA 18WGUA06R21pU5CIu7hRM2Of1wbClbobuIEbJDA++/BW05HsFYrLOZSyA5zM+JVUXLe6kf 4xTu3A52SbQc+Vhw7f+peMGlZBhQ83Xeejdt+OLPTjv/LkYh3sFYe+6UxQ5kmw== 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 4XZ2c4250yzfym; Thu, 24 Oct 2024 10:44:52 +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 49OAiqMB077138; Thu, 24 Oct 2024 10:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49OAiqYT077135; Thu, 24 Oct 2024 10:44:52 GMT (envelope-from git) Date: Thu, 24 Oct 2024 10:44:52 GMT Message-Id: <202410241044.49OAiqYT077135@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 184a22447d5c - main - math/apache-commons-math: unbreak armv6 and 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: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 184a22447d5cc5e297015b0e5fb51149505c3c05 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=184a22447d5cc5e297015b0e5fb51149505c3c05 commit 184a22447d5cc5e297015b0e5fb51149505c3c05 Author: Ronald Klop AuthorDate: 2024-10-24 10:31:53 +0000 Commit: Ronald Klop CommitDate: 2024-10-24 10:44:06 +0000 math/apache-commons-math: unbreak armv6 and armv7 PR: 282301 Approved by: bofh@ / maintainer (as long as it doesn't break Tier 1) --- math/apache-commons-math/Makefile | 3 --- ..._math3_optimization_direct_PowellOptimizer.java | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/math/apache-commons-math/Makefile b/math/apache-commons-math/Makefile index 2939cf7ac7dc..efd30987afbf 100644 --- a/math/apache-commons-math/Makefile +++ b/math/apache-commons-math/Makefile @@ -16,9 +16,6 @@ WWW= https://commons.apache.org/proper/commons-math/ LICENSE= APACHE20 -BROKEN_armv6= fails to compile: build.xml: Compile failed; see the compiler error output for details -BROKEN_armv7= fails to compile: PowellOptimizer.java:301: error: Illegal static declaration in inner class PowellOptimizer.LineSearch - USE_ANT= yes USE_JAVA= yes USE_LOCALE= en_US.ISO8859-1 diff --git a/math/apache-commons-math/files/patch-src_main_java_org_apache_commons_math3_optimization_direct_PowellOptimizer.java b/math/apache-commons-math/files/patch-src_main_java_org_apache_commons_math3_optimization_direct_PowellOptimizer.java new file mode 100644 index 000000000000..4cfd84630589 --- /dev/null +++ b/math/apache-commons-math/files/patch-src_main_java_org_apache_commons_math3_optimization_direct_PowellOptimizer.java @@ -0,0 +1,22 @@ +BROKEN_armv7= fails to compile: PowellOptimizer.java:301: error: Illegal static declaration in inner class PowellOptimizer.LineSearch + +--- src/main/java/org/apache/commons/math3/optimization/direct/PowellOptimizer.java.orig 2024-10-24 09:29:04 UTC ++++ src/main/java/org/apache/commons/math3/optimization/direct/PowellOptimizer.java +@@ -297,7 +297,7 @@ public class PowellOptimizer + * but will not pass the convergence check, so that the custom checker + * will always decide when to stop the line search. + */ +- private static final double ABS_TOL_UNUSED = Double.MIN_VALUE; ++// private static final double ABS_TOL_UNUSED = Double.MIN_VALUE; + /** + * Automatic bracketing. + */ +@@ -314,7 +314,7 @@ public class PowellOptimizer + LineSearch(double rel, + double abs) { + super(REL_TOL_UNUSED, +- ABS_TOL_UNUSED, ++ /* ABS_TOL_UNUSED */ Double.MIN_VALUE, + new SimpleUnivariateValueChecker(rel, abs)); + } +