Date: Thu, 24 Oct 2024 10:44:52 GMT From: Ronald Klop <ronald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 184a22447d5c - main - math/apache-commons-math: unbreak armv6 and armv7 Message-ID: <202410241044.49OAiqYT077135@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=184a22447d5cc5e297015b0e5fb51149505c3c05 commit 184a22447d5cc5e297015b0e5fb51149505c3c05 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2024-10-24 10:31:53 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> 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)); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410241044.49OAiqYT077135>