Merge 7d9e3e0 into 8dbd1b8

Author: paleolimbot

.github/workflows/check-standard.yaml

@@ -40,14 +40,15 @@ jobs:
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
-      - name: Install openssl (MacOS)
+      - name: Debug OSX
         if: runner.os == 'MacOS'
         run: |
-          brew reinstall pkg-config openssl@1.1
-          echo "$PKG_CONFIG_PATH"
-          export PKG_CONFIG_PATH=$(brew --prefix openssl)/lib/pkgconfig
-          echo "$PKG_CONFIG_PATH"
-          pkg-config --cflags openssl
+          brew --prefix openssl@1.1 || true
+          ls $(brew --prefix openssl@1.1) || true
+          brew install openssl@1.1
+          brew --prefix openssl@1.1 || true
+          ls $(brew --prefix openssl@1.1) || true
+          ls /opt/homebrew/opt/openssl@1.1 || true
 
       - uses: r-lib/actions/setup-r-dependencies@v1
         with:

NEWS.md

@@ -1,5 +1,7 @@
 # s2 (development version)
 
+- Fix for s2 build on Windows with R <= 3.6.x (#142)
+
 # s2 1.0.7
 
 - Update the internal copy of s2geometry to use updated Abseil,

configure

@@ -33,9 +33,9 @@ elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
 elif [ `uname` = "Darwin" ]; then
   brew --version 2>/dev/null
   if [ $? -eq 0 ]; then
-    BREWDIR=`brew --prefix`
-    PKG_CFLAGS="-I$BREWDIR/opt/openssl/include"
-    PKG_LIBS="-L$BREWDIR/opt/openssl/lib $PKG_LIBS"
+    BREWDIR=`brew --prefix openssl@1.1`
+    PKG_CFLAGS="-I$BREWDIR/include"
+    PKG_LIBS="-L$BREWDIR/lib $PKG_LIBS"
   else
     curl -sfL "https://autobrew.github.io/scripts/$PKG_BREW_NAME" > autobrew
     . autobrew

src/Makevars.win

@@ -1,4 +1,4 @@
-PKG_CPPFLAGS = -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -I../windows/openssl-1.1.1k/include -I../src
+PKG_CPPFLAGS = -DS2_USE_EXACTFLOAT -D_USE_MATH_DEFINES -DNDEBUG -DIS_LITTLE_ENDIAN -DOMIT_STRPTIME -I../windows/openssl-1.1.1k/include -I../src
 PKG_LIBS = -Ls2 -ls2static -L../windows/openssl-1.1.1k/lib${R_ARCH}${CRT} -lssl -lcrypto -lcrypt32 -lws2_32
 
 CXX_STD = CXX11

src/absl/time/internal/cctz/src/time_zone_format.cc

@@ -56,7 +56,7 @@ namespace detail {
 
 namespace {
 
-#if !HAS_STRPTIME
+#if !HAS_STRPTIME && !defined(OMIT_STRPTIME)
 // Build a strptime() using C++11's std::get_time().
 char* strptime(const char* s, const char* fmt, std::tm* tm) {
   std::istringstream input(s);
@@ -67,6 +67,13 @@ char* strptime(const char* s, const char* fmt, std::tm* tm) {
 }
 #endif
 
+#if defined(OMIT_STRPTIME)
+// Dummy version of strptime() (not needed for s2 and not accessible via old rtools)
+char* strptime(const char* s, const char* fmt, std::tm* tm) {
+  return (char*) s;
+}
+#endif
+
 // Convert a cctz::weekday to a tm_wday value (0-6, Sunday = 0).
 int ToTmWday(weekday wd) {
   switch (wd) {