<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d389f5bc2edd0e5fa5f71897bfa7407c1569a763">https://github.com/macports/macports-base/commit/d389f5bc2edd0e5fa5f71897bfa7407c1569a763</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d389f5bc2edd0e5fa5f71897bfa7407c1569a763
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 2 17:10:38 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> pextlib: Only build objects if necessary
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For functions that might be unavailable, but we have a replacement
</span><span style='display:block; white-space:pre;color:#404040;'> in the source, make the HAVE_* definitions available to Makefiles.
</span>---
Mk/macports.autoconf.mk.in | 4 ++++
configure | 27 ++++++++++++++++++++++++---
configure.ac | 11 ++++++++---
src/pextlib1.0/Makefile.in | 13 +++++++++----
4 files changed, 45 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Mk/macports.autoconf.mk.in b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;color:#808080;'>index f179cc1..100c8da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,3 +61,7 @@ mpconfigdir = @MPCONFIGDIR@
</span> MACPORTS_VERSION = @MACPORTS_VERSION@
SILENT = @
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETDELIM = @HAVE_GETDELIM@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETLINE = @HAVE_GETLINE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_STRLCAT = @HAVE_STRLCAT@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index de6c09c..923c29d 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -667,7 +667,9 @@ OS_MAJOR
</span> OS_PLATFORM
READLINE_LIBS
MD5_LIBS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ac_cv_func_strlcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_STRLCAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETDELIM
</span> EGREP
GREP
CPP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7127,8 +7129,8 @@ done
</span>
# Checks for library functions.
for ac_func in OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile getline getdelim \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flock fls kqueue posix_spawn setmode strlcat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flock fls kqueue posix_spawn setmode \
</span> strlcpy sysctlbyname
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7142,6 +7144,25 @@ fi
</span> done
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check for library functions, replacements are in pextlib1.0/compat/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for ac_func in getline getdelim strlcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+do :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>confdefs.h <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETDELIM=$ac_cv_func_getdelim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_GETLINE=$ac_cv_func_getline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+HAVE_STRLCAT=$ac_cv_func_strlcat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
ac_fn_c_check_decl "$LINENO" "atomic_compare_exchange_strong_explicit" "ac_cv_have_decl_atomic_compare_exchange_strong_explicit" "#include <stdatomic.h>
"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index c9e3a8b..6f590b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,10 +236,15 @@ AC_CHECK_HEADERS([crt_externs.h err.h fcntl.h libkern/OSAtomic.h libproc.h limit
</span>
# Checks for library functions.
AC_CHECK_FUNCS([OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile getline getdelim \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flock fls kqueue posix_spawn setmode strlcat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSAtomicCompareAndSwapPtr __getdirentries64 clearenv copyfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flock fls kqueue posix_spawn setmode \
</span> strlcpy sysctlbyname])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_SUBST([ac_cv_func_strlcat])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Check for library functions, replacements are in pextlib1.0/compat/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_CHECK_FUNCS([getline getdelim strlcat])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(HAVE_GETDELIM, $ac_cv_func_getdelim)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(HAVE_GETLINE, $ac_cv_func_getline)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(HAVE_STRLCAT, $ac_cv_func_strlcat)
</span>
AC_CHECK_DECLS([atomic_compare_exchange_strong_explicit], [], [], [[#include <stdatomic.h>]])
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/pextlib1.0/Makefile.in b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index bee9482..f11f3fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/pextlib1.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,6 @@ OBJS= \
</span> adv-flock.o \
base32cmd.o \
curl.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- getdelim.o \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getline.o \
</span> filemap.o \
fs-traverse.o \
md5cmd.o \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +30,15 @@ OBJS= \
</span> ifeq (@TRACEMODE_SUPPORT@,1)
OBJS+=sip_copy_proc.o
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ifneq (@ac_cv_func_strlcat@,yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-OBJS+=strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_GETDELIM),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= strlcat.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_GETLINE),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= getline.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ifneq ($(HAVE_STRLCAT),yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+OBJS+= strlcat.o
</span> endif
SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
</pre><pre style='margin:0'>
</pre>