<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bfab43e997936de2c9251e3a0f780944009d6602">https://github.com/macports/macports-ports/commit/bfab43e997936de2c9251e3a0f780944009d6602</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bfab43e gdal: upstream patch to to fix non-C++11 builds
</span>bfab43e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfab43e997936de2c9251e3a0f780944009d6602
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat May 20 00:10:16 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: upstream patch to to fix non-C++11 builds
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54203
</span>---
gis/gdal/Portfile | 12 ++++++
gis/gdal/files/patch-configure-isnan.diff | 53 +++++++++++++++++++++++++
gis/gdal/files/patch-port-cpl_config.h.in.patch | 9 +++++
gis/gdal/files/patch-port-cpl_port.h.diff | 16 ++++++++
4 files changed, 90 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b224b7f..f85bc53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,6 +113,18 @@ patchfiles patch-gdalwarpkernel_opencl_h.diff \
</span> # see https://github.com/mdadams/jasper/commit/d42b2388f7f8e0332c846675133acea151fc557a#diff-c9eea58015962f20fc7ba09e1388c3da
patchfiles-append patch-uchar.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# for all platforms without C++11 support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is just a suboptimal approximation (doesn't hold for gcc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.cxx_stdlib} != "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-cpp11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backported from master and could be applied everywhere
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-isnan.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-port-cpl_config.h.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-port-cpl_port.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
global worksrcpath_dirs
if { ![variant_isset universal] } {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-configure-isnan.diff b/gis/gdal/files/patch-configure-isnan.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ee88400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-configure-isnan.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17954,6 +17954,50 @@ if test "x$CXX" = x ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as_fn_error $? "\"You don't have a working C++ compiler.\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::isnan" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo_n "checking for std::isnan... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_ext=cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_cpp='$CXXCPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int CPLIsNan(float f) { return std::isnan(f); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ac_fn_cxx_try_compile "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</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 HAVE_STD_IS_NAN 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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$as_echo "no" >&6; }
</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;'>++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_ext=c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_cpp='$CPP $CPPFLAGS'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ac_compiler_gnu=$ac_cv_c_compiler_gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check whether --with-libtool was given.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "${with_libtool+set}" = set; then :
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-port-cpl_config.h.in.patch b/gis/gdal/files/patch-port-cpl_config.h.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7baeec8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-port-cpl_config.h.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- port/cpl_config.h.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ port/cpl_config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,3 +258,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Define to 1 if you have the `uselocale' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef HAVE_USELOCALE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Define to 1 if you have the `std::isnan' function. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_STD_IS_NAN
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/files/patch-port-cpl_port.h.diff b/gis/gdal/files/patch-port-cpl_port.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b80b5f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/files/patch-port-cpl_port.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- port/cpl_port.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ port/cpl_port.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -653,10 +653,11 @@ static inline char* CPL_afl_friendly_strstr(const char* haystack, const char* ne
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define CPLIsNan(x) _isnan(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define CPLIsInf(x) (!_isnan(x) && !_finite(x))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define CPLIsFinite(x) _finite(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__cplusplus) && defined(__MINGW32__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Hack for compatibility with ancient i586-mingw32msvc toolchain */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__cplusplus) && defined(HAVE_STD_IS_NAN) && HAVE_STD_IS_NAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C++" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef DOXYGEN_SKIP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cmath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int CPLIsNan(float f) { return std::isnan(f); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int CPLIsNan(double f) { return std::isnan(f); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int CPLIsInf(float f) { return std::isinf(f); }
</span></pre><pre style='margin:0'>
</pre>