Only change the xcrun workaround for particular macOS versions

r-lib · Mar 10, 2020 · acb7338 · acb7338
1 parent 2970727
commit acb7338
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
-# xml2 1.2.4
+# xml2 1.2.5
+
+* Fix compilation issue on macOS versions after High Sierra when not using homebrew supplied libxml2
 
-# xml2 1.2.3
+# xml2 1.2.4
 
 * Fix potential dangling pointer with internal `asXmlChar()` function (@michaelquinn32, #287).
 

diff --git a/configure b/configure
@@ -31,7 +31,7 @@ else
     # MacOS versions El Capitan and later ship a xml2-config which appends `xcrun
     # --show-sdk-path` to the xml2-config. So we remove it if it is present.
     # (https://stat.ethz.ch/pipermail/r-sig-mac/2016-September/012046.html)
-    if [ "$OS_TYPE" = "Darwin" ] && [ "$OS_VERSION" -gt "14" ]; then
+    if [ "$OS_TYPE" = "Darwin" ] && [ "$OS_VERSION" -gt "13" ] && [ "$OS_VERSION" -lt "17" ]; then
       PKGCONFIG_CFLAGS=`echo $PKGCONFIG_CFLAGS | perl -pe "s{\Q\`xcrun -show-sdk-path\`\E}{}"`
       PKGCONFIG_LIBS=`echo $PKGCONFIG_LIBS | perl -pe "s{\Q\`xcrun -show-sdk-path\`\E}{}"`
     fi

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,6 +1,6 @@
 ## Release summary
 
-This is a patch release fixing CRAN failures
+This release fixes errors in the previous release on macOS versions after High Sierra
 
 ## Test environments