UPDATE: math/R

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: math/R

Ingo Feinerer-2
Dear useRs,

update math/R 3.6.0 -> 3.6.1

- SHARED_LIBS: increase major version number

  check_sym reports added and removed symbols for libR:

  $ /usr/src/lib/check_sym libR.so.35.0 /usr/local/lib/R/lib/libR.so.36.0
  libR.so.35.0 --> /usr/local/lib/R/lib/libR.so.36.0
  Dynamic export changes:
  added:
          dummy_ii_ptr

  External reference changes:
  added:
          tilde_expand_word

  removed:
          tilde_expand

  PLT removed:
          dummy_ii

- PERMIT_PACKAGE_CDROM -> PERMIT_PACKAGE

- Disable OpenMP as requested in https://marc.info/?l=openbsd-ports&m=156176148832402&w=2

- Regenerate patches

Works for me on amd64.

OK?

Best regards,
Ingo

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile 17 May 2019 16:45:27 -0000 1.111
+++ Makefile 5 Jul 2019 08:37:42 -0000
@@ -1,10 +1,9 @@
 # $OpenBSD: Makefile,v 1.111 2019/05/17 16:45:27 sthen Exp $
 
 COMMENT= powerful math/statistics/graphics language
-DISTNAME= R-3.6.0
-REVISION= 0
+DISTNAME= R-3.6.1
 
-SO_VERSION= 35.0
+SO_VERSION= 36.0
 .for _lib in R Rblas Rlapack
 SHARED_LIBS += ${_lib} ${SO_VERSION}
 .endfor
@@ -15,7 +14,7 @@ HOMEPAGE= https://www.r-project.org/
 MAINTAINER= Ingo Feinerer <[hidden email]>
 
 # GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ${MODTK_WANTLIB}
 WANTLIB += ICE SM X11 Xext Xmu Xss Xt bz2 c cairo crypto curl
@@ -79,6 +78,7 @@ CONFIGURE_STYLE=gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools
 
 CONFIGURE_ARGS= --disable-java \
+ --disable-openmp \
  --enable-BLAS-shlib \
  --enable-R-shlib \
  --with-tcl-config=${MODTCL_CONFIG} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/R/distinfo,v
retrieving revision 1.43
diff -u -p -r1.43 distinfo
--- distinfo 29 Apr 2019 08:52:47 -0000 1.43
+++ distinfo 5 Jul 2019 08:37:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (R-3.6.0.tar.gz) = NvysPkUmZhWOYkWcb8gQrcJHxxCe1xxbbDrV/Cv1dQk=
-SIZE (R-3.6.0.tar.gz) = 30449618
+SHA256 (R-3.6.1.tar.gz) = W6qevT5xrOzcw9ox2QQvsXTVWkKCn4MV8kVwgJeLE4k=
+SIZE (R-3.6.1.tar.gz) = 30463021
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/R/patches/patch-configure,v
retrieving revision 1.38
diff -u -p -r1.38 patch-configure
--- patches/patch-configure 29 Apr 2019 08:52:47 -0000 1.38
+++ patches/patch-configure 5 Jul 2019 08:37:42 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.38 2019/04
 Index: configure
 --- configure.orig
 +++ configure
-@@ -41796,8 +41796,8 @@ fi
+@@ -41831,8 +41831,8 @@ fi
 
  fi
  if test "${have_zlib}" = yes; then
@@ -14,7 +14,7 @@ Index: configure
  if ${r_cv_header_zlib_h+:} false; then :
    $as_echo_n "(cached) " >&6
  else
-@@ -41812,7 +41812,7 @@ else
+@@ -41847,7 +41847,7 @@ else
  #include <zlib.h>
  int main() {
  #ifdef ZLIB_VERNUM

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: math/R

Klemens Nanni-2
OK kn

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: math/R

Stuart Henderson
In reply to this post by Ingo Feinerer-2
On 2019/07/05 10:44, Ingo Feinerer wrote:

> Dear useRs,
>
> update math/R 3.6.0 -> 3.6.1
>
> - SHARED_LIBS: increase major version number
>
>   check_sym reports added and removed symbols for libR:
>
>   $ /usr/src/lib/check_sym libR.so.35.0 /usr/local/lib/R/lib/libR.so.36.0
>   libR.so.35.0 --> /usr/local/lib/R/lib/libR.so.36.0
>   Dynamic export changes:
>   added:
>           dummy_ii_ptr
>
>   External reference changes:
>   added:
>           tilde_expand_word
>
>   removed:
>           tilde_expand
>
>   PLT removed:
>           dummy_ii

That is an added symbol only. The tool you are using to check this is
of wider use than just ports - the bit you are interested in here is
"dynamic export changes".