pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: Proposed macOS patch for math/R



On 9/26/23 07:46, Jason Bacon wrote:

The following patch unbreaks build on macOS 13.5.  Let me know if there
is any reason not to commit it (please test on other macOS versions if
possible).  Thanks...

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/R/Makefile,v
retrieving revision 1.241
diff -u -r1.241 Makefile
--- Makefile    21 Jul 2023 22:46:50 -0000      1.241
+++ Makefile    26 Sep 2023 12:41:58 -0000
@@ -104,6 +104,10 @@

  CONFIGURE_ARGS.Darwin+=        --disable-openmp

+# Temporary fix for deprecated function ATSFontFindFromName()
+# https://trac.macports.org/ticket/66095
+MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="12.0"
+
  # R_PAPERSIZE can be: A4, Letter, Legal, Executive
  .if defined(PAPERSIZE)
  R_PAPERSIZE?=          ${PAPERSIZE}

Actually, I think this would break R on macOS 11, which is still supported, so the patch below would be the right approach. I'll commit this shortly unless I hear from anyone.

--- Makefile    21 Jul 2023 22:46:50 -0000      1.241
+++ Makefile    26 Sep 2023 18:48:02 -0000
@@ -104,6 +104,14 @@

 CONFIGURE_ARGS.Darwin+=        --disable-openmp

+# Temporary fix for deprecated function ATSFontFindFromName() in R 4.2.0
+# Newer R versions should eliminate this function and obsolete this hack
+# https://trac.macports.org/ticket/66095
+# Darwin 21 corresponds to macOS 12
+.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} > 21
+MAKE_ENV.Darwin+= MACOSX_DEPLOYMENT_TARGET="12.0"
+.endif
+
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
 .if defined(PAPERSIZE)
 R_PAPERSIZE?=          ${PAPERSIZE}



Home | Main Index | Thread Index | Old Index