Skip to content

Commit 2143994

Browse files
author
mef
committed
(math/R-nloptr) Updated 1.2.2.2 to 2.0.3
# nloptr 2.0.3 * Improved compatibility on RHEL/CentOS by first searching for a `cmake3` binary on the `PATH` (#104). * Improved backward compatibility with older versions of `cmake` (#119). # nloptr 2.0.2 This is a patch version in which: * I link to the `nlopt` library via `nlopt/lib/libnlopt.a` instead of `-Lnlopt/lib -lnlopt` when building `nlopt` from included sources to avoid potential mess where `-lnlopt` could look for the `nlopt` library in other places and possibly link with an existing too old system build of `nlopt`. Additionally, we contacted Simon Urbanek for updating the `nlopt` recipe for macOS users so that it does now match the latest `v2.7.1`, which should avoid `nlopt` to be built on the fly on CRAN machines. # nloptr 2.0.1 This is a release mainly for increasing direct compatibility with most user cases. In details, here is the list of changes that have been made: * Update `SystemRequirements` description to make it clearer which minimal versions of `cmake` (`>= 3.15.0`) and `nlopt` (`>= 2.7.0`) are required (#100, @HenrikBengtsson). * End configuration sooner and louder if `cmake` is missing when needed with clearer message (#103, @eddelbuettel). * Ensure system-wide installation of `cmake` in the list of suggestions to install it when missing. * Update GHA scripts to latest versions. * Configure git to always use LF line endings for configure.ac file. * Add CI for R-devel on Windows with Rtools42. * Fix for compatibility with versions of R anterior to `4.0` (#111). * Look for a `cmake3` binary in the current path before `cmake` for increasing compatibility with most RHEL/CentOS users (#104, @bhogan-mitre @HenrikBengtsson). # nloptr 2.0.0 ## Major changes * Use [CMake](https://cmake.org) to build `nlopt` from included sources on macOS and on Linux if no system build of NLopt (>= 2.7.0) is found. * Update included sources of NLopt to latest version (2.7.1). * Put back the ability on Linux platforms to re-use an existing external build of NLopt instead of building from the included sources (contributed by Dirk Eddelbuettel, #88). * Now builds using NLopt from `rwinlib` on Windows current release (contributed by Jeroen Ooms, #92), or NLopt from `Rtools42` on Windows devel (contributed by Tomas Kalibera). ## Minor changes * Added a `NEWS.md` file to track changes to the package. * Use markdown in Roxygen documentation. * Added a logo and a proper [**nloptr** website](https://astamm.github.io/nloptr/). * Added coverage. * Switch from Travis to Github Actions for CI. * Use Catch for unit testing C/C++ code. * Now tracking code coverage. * Update NLopt-related URLs following migration of [NLopt website](https://nlopt.readthedocs.io/en/latest/). * Fixed bug to avoid linking issues when using the C API via `#include <nloptrAPI.h>` in several source files. * Fix precision issue in test example `hs071` (astamm/nloptr#81, @Tom-python0121). * Made NLopt algorithm `NLOPT_GN_ESCH` available from R interface (contributed by Xiongtao Dai).
1 parent 230f180 commit 2143994

File tree

3 files changed

+21
-35
lines changed

3 files changed

+21
-35
lines changed

‎math/R-nloptr/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# $NetBSD: Makefile,v 1.8 2021/09/20 01:16:44 mef Exp $
1+
# $NetBSD: Makefile,v 1.9 2023/08/11 08:41:09 mef Exp $
22

33
R_PKGNAME= nloptr
4-
R_PKGVER= 1.2.2.2
4+
R_PKGVER= 2.0.3
55

66
MAINTAINER= [email protected]
77
COMMENT= R interface to NLopt
@@ -10,11 +10,12 @@ LICENSE= gnu-lgpl-v3
1010
TEST_DEPENDS+= R-knitr-[0-9]*:../../print/R-knitr
1111
TEST_DEPENDS+= R-rmarkdown-[0-9]*:../../textproc/R-rmarkdown
1212
TEST_DEPENDS+= R-inline-[0-9]*:../../devel/R-inline
13-
TEST_DEPENDS+= R-testthat-[0-9]*:../../devel/R-testthat
13+
#EST_DEPENDS+= R-testthat-[0-9]*:../../devel/R-testthat
1414

15-
USE_LANGUAGES= c c++
15+
USE_LANGUAGES= c c++ fortran77
1616
USE_TOOLS+= pkg-config
1717

1818
.include "../../math/R/Makefile.extension"
1919
.include "../../math/nlopt/buildlink3.mk"
20+
.include "../../devel/R-testthat/buildlink3.mk"
2021
.include "../../mk/bsd.pkg.mk"

‎math/R-nloptr/distinfo

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$NetBSD: distinfo,v 1.6 2021/10/26 10:55:30 nia Exp $
1+
$NetBSD: distinfo,v 1.7 2023/08/11 08:41:09 mef Exp $
22

3-
BLAKE2s (R/nloptr_1.2.2.2.tar.gz) = d62d15837dcc9f1cbb8c3528debff147b5d6d2a97aed4657ca979989e2163c5d
4-
SHA512 (R/nloptr_1.2.2.2.tar.gz) = fc553ab44f30d0d67be7a1a6cb67e24a90b74943505b3331e7f8f474bfa58a4655b23137c88d350472d4b7ffcb34503ba7ae81692948c4943600a2793e33ccc7
5-
Size (R/nloptr_1.2.2.2.tar.gz) = 2450931 bytes
6-
SHA1 (patch-configure) = 30a2e272640cbf158a11d802b1162216fa42d919
3+
BLAKE2s (R/nloptr_2.0.3.tar.gz) = fe92ef7297289695918b121ae1cd1b916c68119516c4ecde393038a8bc58d579
4+
SHA512 (R/nloptr_2.0.3.tar.gz) = 08f8a6b7ddc20f7b75c567ee7e55abd47228c4fc8db254080dc7f4010311a92ad4c75ca9b593adbb4183308e4142fdc9ab80aed1b7fe5da3b7450a19624b98e6
5+
Size (R/nloptr_2.0.3.tar.gz) = 2219877 bytes
6+
SHA1 (patch-configure) = 4cae010fd9245d667bf8c4be45f9dd65303ac9c9

‎math/R-nloptr/patches/patch-configure

+11-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
1-
$NetBSD: patch-configure,v 1.3 2021/09/20 01:16:44 mef Exp $
1+
$NetBSD: patch-configure,v 1.4 2023/08/11 08:41:09 mef Exp $
22

3-
=> Checking for portability problems in extracted files
43
ERROR: [check-portability.awk] => Found test ... == ...:
5-
ERROR: [check-portability.awk] configure:2974: if test x"${nlopt_libs}" == x""; then
6-
ERROR: [check-portability.awk] configure:2975: if test x"${PKGCONFIG}" == x"yes"; then
7-
ERROR: [check-portability.awk] configure:3272: if test x"${PKGCONFIG}" == x"yes"; then
84

9-
--- configure.orig 2020-07-03 02:30:38.000000000 +0900
10-
+++ configure 2021-09-18 13:38:30.459037943 +0900
11-
@@ -2971,8 +2971,8 @@ nlopt_libs=""
5+
--- configure.orig 2022-05-26 23:40:24.000000000 +0900
6+
+++ configure 2023-08-11 16:48:17.053659088 +0900
7+
@@ -3320,7 +3320,7 @@ printf "%s\n" "no" >&6; }
8+
fi
129

13-
## also use pkg-config to check for NLopt
14-
##
15-
-if test x"${nlopt_libs}" == x""; then
16-
- if test x"${PKGCONFIG}" == x"yes"; then
17-
+if test x"${nlopt_libs}" = x""; then
18-
+ if test x"${PKGCONFIG}" = x"yes"; then
19-
## check via pkg-config for nlopt
20-
if pkg-config --exists nlopt; then
21-
## obtain cflags and obtain libs
22-
@@ -3269,7 +3269,7 @@ fi
23-
if test x"${nlopt_good}" = x"yes"; then
24-
{ $as_echo "$as_me:${as_lineno-$LINENO}: Now testing for NLopt version 2.4.0 or greater." >&5
25-
$as_echo "$as_me: Now testing for NLopt version 2.4.0 or greater." >&6;}
26-
- if test x"${PKGCONFIG}" == x"yes"; then
27-
+ if test x"${PKGCONFIG}" = x"yes"; then
28-
## check via pkg-config for version number of nlopt
29-
if pkg-config --exists nlopt; then
30-
## obtain version number
10+
11+
- if test x"${have_cmake}" == x"no"; then
12+
+ if test x"${have_cmake}" = x"no"; then
13+
. src/scripts/cmake_config.sh
14+
if test -z "${CMAKE_BIN}"; then
15+
## also error to end configure here

0 commit comments

Comments
 (0)