Skip to content

Commit d8378c5

Browse files
committed
relax libnng requirement to 1.9.0
1 parent 1f8a010 commit d8378c5

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ License: GPL (>= 3)
2525
BugReports: https://github.com/shikokuchuo/nanonext/issues
2626
URL: https://shikokuchuo.net/nanonext/, https://github.com/shikokuchuo/nanonext/
2727
Encoding: UTF-8
28-
SystemRequirements: 'libnng' >= 1.6 and 'libmbedtls' >= 2.5, or 'cmake' and 'xz'
28+
SystemRequirements: 'libnng' >= 1.9 and 'libmbedtls' >= 2.5, or 'cmake' and 'xz'
2929
to compile NNG and/or Mbed TLS included in package sources
3030
Depends:
3131
R (>= 3.6)

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* The abillity to `lock()` and `unlock()` sockets is removed.
77
* Renders it safe to serialize 'nano' and 'aio' objects - they will be inactive when unserialized.
88
* Unified Windows build system now compiles 'libmbedtls' and 'libnng' from source even on R <= 4.1 using Rtools40 or earlier.
9-
* Requires 'libnng' >= 1.10.0.
9+
* Requires 'libnng' >= 1.9.0.
1010

1111
# nanonext 1.5.0
1212

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ install.packages("nanonext", repos = "https://shikokuchuo.r-universe.dev")
145145

146146
#### Linux / Mac / Solaris
147147

148-
Installation from source requires 'libnng' >= v1.10.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.10.1 and 'libmbedtls' v3.6.2 included within the package sources.
148+
Installation from source requires 'libnng' >= v1.9.0 and 'libmbedtls' >= 2.5.0 (suitable installations are automatically detected), or else 'cmake' to compile 'libnng' v1.10.1 and 'libmbedtls' v3.6.2 included within the package sources.
149149

150150
**It is recommended for optimal performance and stability to let the package automatically compile bundled versions of 'libmbedtls' and 'libnng' during installation.** To ensure the libraries are compiled from source even if system installations are present, set the `NANONEXT_LIBS` environment variable prior to installation e.g. by `Sys.setenv(NANONEXT_LIBS = 1)`.
151151

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ install.packages("nanonext", repos = "https://shikokuchuo.r-universe.dev")
174174

175175
#### Linux / Mac / Solaris
176176

177-
Installation from source requires ‘libnng’ \>= v1.10.0 and ‘libmbedtls’
177+
Installation from source requires ‘libnng’ \>= v1.9.0 and ‘libmbedtls’
178178
\>= 2.5.0 (suitable installations are automatically detected), or else
179179
‘cmake’ to compile ‘libnng’ v1.10.1 and ‘libmbedtls’ v3.6.2 included
180180
within the package sources.

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fi
7070

7171
if [ $? -ne 0 ]
7272
then
73-
echo "Existing 'libmbedtls' >= 2.5 not found"
73+
echo "Existing 'libmbedtls' >= 2.5.0 not found"
7474
echo "Detecting 'cmake'..."
7575
which cmake
7676
if [ $? -ne 0 ]
@@ -128,7 +128,7 @@ fi
128128

129129
echo "#include <nng/nng.h>
130130
int main() {
131-
#if NNG_MAJOR_VERSION < 1 || NNG_MAJOR_VERSION == 1 && NNG_MINOR_VERSION < 10
131+
#if NNG_MAJOR_VERSION < 1 || NNG_MAJOR_VERSION == 1 && NNG_MINOR_VERSION < 9
132132
*(void *) 0 = 0;
133133
#endif
134134
}" | ${CC} ${NNG_CFLAGS} -xc - -o /dev/null > /dev/null 2>&1
@@ -140,7 +140,7 @@ fi
140140

141141
if [ $? -ne 0 ]
142142
then
143-
echo "Existing 'libnng' >= 1.10 not found"
143+
echo "Existing 'libnng' >= 1.9.0 not found"
144144
echo "Detecting 'cmake'..."
145145
which cmake
146146
if [ $? -ne 0 ]

0 commit comments

Comments
 (0)