tweaks for macOS' static libraries

git-svn-id: https://svn.r-project.org/R/trunk@87943 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

configure

@@ -656,6 +656,7 @@ gt_needs=
 ac_func_c_list=
 enable_year2038=no
 ac_subst_vars='LTLIBOBJS
+LIBS_PKGS
 FC_VER
 REC_INSTALL_OPT
 CC_VER
@@ -27549,7 +27550,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_verb"
-(eval echo $as_me:27552: \"$ac_link\") >&5
+(eval echo $as_me:27553: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -27627,7 +27628,7 @@ _ACEOF
 # flags.
 r_save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $r_cv_prog_c_v"
-(eval echo $as_me:27630: \"$ac_link\") >&5
+(eval echo $as_me:27631: \"$ac_link\") >&5
 r_c_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
 echo "$r_c_v_output" >&5
 CFLAGS=$r_save_CFLAGS
@@ -63978,6 +63979,18 @@ CFLAGS=${CFLAGS_KEEP}
 FFLAGS=${FFLAGS_KEEP}
 CXXFLAGS=${CXXFLAGS_KEEP}
 
+## allow different LIBS in etc/Makeconf
+   LIBS_PKGS=${LIBS}
+case "${host_os}" in
+   darwin*)
+   ## This will usually include -lpcre2-8 -ldeflate -lzstd -llzma all
+   ## of which are static and not part of a binary distribution, so we
+   ## strip them.  This is macOS, so could use sed -E (which is POSIX)
+   LIBS_PKGS=`echo ${LIBS} | sed s/\ -lpcre2-8// | sed s/\ -ldeflate// | sed s/\ -lzstd// | sed s/\ -llzma//`
+   ;;
+esac
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure

configure.ac

@@ -2928,8 +2928,8 @@ if test "${USE_NLS}" = "yes"; then
   if test -n "$INTL_MACOSX_LIBS"; then
 dnl This is no longer valid (if it ever was)
 dnl    XTRA_INTL_CPPFLAGS=-I/System/Library/Frameworks/CoreFoundation.framework/Headers
-dnl On a macOS build which uses static libraries, libintk_dgettext
-dnl etc are provided by libR.dylib
+dnl On a macOS build which uses static libraries, libintl_dgettext
+dnl etc are provided by libR.dylib.
      LIBINTL_PKGS=
    else
      LIBINTL_PKGS=${LIBINTL}
@@ -3162,6 +3162,18 @@ CFLAGS=${CFLAGS_KEEP}
 FFLAGS=${FFLAGS_KEEP}
 CXXFLAGS=${CXXFLAGS_KEEP}
 
+## allow different LIBS in etc/Makeconf
+   LIBS_PKGS=${LIBS}
+case "${host_os}" in
+   darwin*)
+   ## This will usually include -lpcre2-8 -ldeflate -lzstd -llzma all
+   ## of which are static and not part of a binary distribution, so we
+   ## strip them.  This is macOS, so could use sed -E (which is POSIX)
+   LIBS_PKGS=`echo ${LIBS} | sed s/\ -lpcre2-8// | sed s/\ -ldeflate// | sed s/\ -lzstd// | sed s/\ -llzma//`
+   ;;
+esac
+AC_SUBST(LIBS_PKGS)
+
 AC_OUTPUT
 
 ## Summarize configure results.

etc/Makeconf.in

@@ -99,9 +99,7 @@ LIBM = @LIBM@
 LIBR0 = @LIBR0@
 LIBR1 = @LIBR1@
 LIBR = @LIBR0@ @LIBR1@
-## FIXME: LIBS is approporiate for building R,
-## but not for packages if static libs are used.
-LIBS = @LIBS@
+LIBS = @LIBS_PKGS@
 ## needed by R CMD config
 LIBnn = @LIBnn@
 LIBTOOL = $(SHELL) "$(R_HOME)/bin/libtool"

m4/R.m4

@@ -3961,7 +3961,7 @@ fi
 ## -------
 ## Look for iconv, possibly in libiconv.
 ## Need to include <iconv.h> as this may define iconv as a macro.
-## libiconv, e.g. on macOS, has iconv as a macro and needs -liconv.
+## GNU libiconv, e.g. on older macOS, has iconv as a macro and needs -liconv.
 AC_DEFUN([R_ICONV],
 [AC_CHECK_HEADERS(iconv.h)
 dnl need to ignore cache for this as it may set LIBS
@@ -3976,6 +3976,7 @@ AC_CACHE_CHECK(for iconv, ac_cv_func_iconv, [
        iconv_close(cd);]])],[ac_cv_func_iconv=yes],[])
   if test "$ac_cv_func_iconv" != yes; then
     r_save_LIBS="$LIBS"
+dnl libiconv is system and hence dynamic on macOS
     LIBS="$LIBS -liconv"
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
 #ifdef HAVE_ICONV_H