Merge pull request #218 from r-lib/dev

Unwrap mbedtls and nng source bundles

Author: shikokuchuo

.gitignore

@@ -7,12 +7,13 @@ src/Makevars
 nanonext.Rcheck/00_pkg_src/nanonext/
 nanonext.Rcheck/
 *.gz
-docs
-install
+/docs/
+/build/
+/install/
 inst/doc
 compile_commands.json
 .cache
-revdep/
+/revdep/
 .claude
 CLAUDE.md
 .DS_Store

DESCRIPTION

@@ -39,5 +39,5 @@ Config/usethis/last-upkeep: 2025-04-23
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.3
-SystemRequirements: 'libnng' >= 1.9 and 'libmbedtls' >= 2.5, or 'cmake'
-    and 'xz' to compile NNG and/or Mbed TLS included in package sources
+SystemRequirements: 'libnng' >= 1.9 and 'libmbedtls' >= 2.5, or 'cmake' to
+    compile NNG and/or Mbed TLS included in package sources

NEWS.md

@@ -1,5 +1,7 @@
 # nanonext (development version)
 
+* Building from source no longer requires `xz`.
+
 # nanonext 1.7.2
 
 #### Updates

README.Rmd

@@ -164,7 +164,7 @@ Installation from source requires 'libnng' >= v1.9.0 and 'libmbedtls' >= 2.5.0 (
 
 As system libraries, 'libnng' is available as libnng-dev (deb) or nng-devel (rpm), and 'libmbedtls' as libmbedtls-dev (deb) or libmbedtls-devel (rpm). The `INCLUDE_DIR` and `LIB_DIR` environment variables may be set prior to package installation to specify a custom location for 'libmbedtls' or 'libnng' other than the standard filesystem locations.
 
-*Additional requirements for Solaris: (i) the 'xz' package - available on OpenCSW, and (ii) a more recent version of 'cmake' than available on OpenCSW - refer to the 'cmake' website for the latest source file.*
+*Solaris: requires a more recent version of 'cmake' than available on OpenCSW - refer to the 'cmake' website for the latest source file.*
 
 #### Windows
 

README.md

@@ -194,8 +194,7 @@ variables may be set prior to package installation to specify a custom
 location for ‘libmbedtls’ or ‘libnng’ other than the standard filesystem
 locations.
 
-*Additional requirements for Solaris: (i) the ‘xz’ package - available
-on OpenCSW, and (ii) a more recent version of ‘cmake’ than available on
+*Solaris: requires a more recent version of ‘cmake’ than available on
 OpenCSW - refer to the ‘cmake’ website for the latest source file.*
 
 #### Windows

cleanup

@@ -1,2 +1,2 @@
 #!/bin/sh
-rm -rf src/Makevars install
+rm -rf src/Makevars build install

cleanup.win

@@ -1 +1 @@
-rm -rf src/Makevars install
+rm -rf src/Makevars build install

configure

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# Library versions
-LIB_VER="111"
-TLS_VER="362"
-
 # Initialise
 PKG_CFLAGS=""
 PKG_LIBS=""
@@ -84,25 +80,10 @@ then
       exit 1
     fi
   fi
-  echo "Detecting 'xz'..."
-  which xz
-  if [ $? -ne 0 ]
-  then
-    tar -xf src/mbedtls-$TLS_VER.tar.xz
-    if [ $? -ne 0 ]
-    then
-      echo "No 'xz' command found"
-      exit 1
-    fi
-  else
-    xz -dc src/mbedtls-$TLS_VER.tar.xz | tar -xf -
-  fi
-  cd mbedtls-$TLS_VER
   echo "Compiling 'libmbedtls' from source ..."
-  cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_LIBDIR=lib .
-  cmake --build . --target install
-  cd ..
-  rm -rf mbedtls-$TLS_VER
+  cmake -S src/mbedtls -B build -DCMAKE_INSTALL_PREFIX=install -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build --target install
+  rm -rf build
 else
   echo "Found 'libmbedtls' $MBEDTLS_CFLAGS"
   PKG_CFLAGS="$MBEDTLS_CFLAGS $PKG_CFLAGS"
@@ -158,25 +139,10 @@ then
       exit 1
     fi
   fi
-  echo "Detecting 'xz'..."
-  which xz
-  if [ $? -ne 0 ]
-  then
-    tar -xf src/nng-$LIB_VER.tar.xz
-    if [ $? -ne 0 ]
-    then
-      echo "No 'xz' command found"
-      exit 1
-    fi
-  else
-    xz -dc src/nng-$LIB_VER.tar.xz | tar -xf -
-  fi
-  cd nng-$LIB_VER
   echo "Compiling 'libnng' from source ..."
-  cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_INSTALL_LIBDIR=lib .
-  cmake --build . --target install
-  cd ..
-  rm -rf nng-$LIB_VER
+  cmake -S src/nng -B build -DCMAKE_INSTALL_PREFIX=install -DCMAKE_INSTALL_LIBDIR=lib
+  cmake --build build --target install
+  rm -rf build
 else
   echo "Found 'libnng' $NNG_CFLAGS"
   PKG_CFLAGS="$NNG_CFLAGS $PKG_CFLAGS"

configure.ucrt

@@ -1,28 +1,18 @@
-# Library versions
-LIB_VER="111"
-TLS_VER="362"
-
 # Find compiler and export flags
 CC=`"${R_HOME}/bin/R" CMD config CC`
 CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
 LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
 export CC CFLAGS LDFLAGS
 
-tar -xf src/mbedtls-$TLS_VER.tar.xz
-cd mbedtls-$TLS_VER
 echo "Compiling 'libmbedtls' from source ..."
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../install .
-cmake --build . --target install
-cd ..
-rm -rf mbedtls-$TLS_VER
+cmake -S src/mbedtls -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=install
+cmake --build build --target install
+rm -rf build
 
-tar -xf src/nng-$LIB_VER.tar.xz
-cd nng-$LIB_VER
 echo "Compiling 'libnng' from source ..."
-cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../install .
-cmake --build . --target install
-cd ..
-rm -rf nng-$LIB_VER
+cmake -S src/nng -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=install
+cmake --build build --target install
+rm -rf build
 
 # Success
 exit 0

configure.win

@@ -1,10 +1,3 @@
-# Library versions
-LIB_VER="111"
-TLS_VER="362"
-
-tar -xf src/mbedtls-$TLS_VER.tar.xz
-tar -xf src/nng-$LIB_VER.tar.xz
-
 for ARCH in x64 i386; do
 
   if [ -e "${R_HOME}/bin/${ARCH}/R" ]; then
@@ -13,30 +6,21 @@ for ARCH in x64 i386; do
     LDFLAGS=`"${R_HOME}/bin/${ARCH}/R" CMD config LDFLAGS`
     export CC CFLAGS LDFLAGS
 
-    cd mbedtls-$TLS_VER
-    mkdir ${ARCH}
-    cd ${ARCH}
     echo "Compiling 'libmbedtls' from source for ${ARCH} ..."
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../../install/${ARCH} ..
-    cmake --build . --target install
-    cd ../..
+    cmake -S src/mbedtls -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=install/${ARCH}
+    cmake --build build --target install
+    rm -rf build
 
-    cd nng-$LIB_VER
-    mkdir ${ARCH}
-    cd ${ARCH}
     echo "Compiling 'libnng' from source for ${ARCH} ..."
-    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=../../install/${ARCH} ..
-    cmake --build . --target install
-    cd ../..
+    cmake -S src/nng -B build -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=install/${ARCH}
+    cmake --build build --target install
+    rm -rf build
 
   else
   echo "Note: ${ARCH} not installed, skipping ..."
   fi
 
 done
 
-rm -rf mbedtls-$TLS_VER
-rm -rf nng-$LIB_VER
-
 # Success
 exit 0