Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jun 2018 07:39:39 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r473113 - head/math/freemat/files
Message-ID:  <201806230739.w5N7ddSA022013@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Sat Jun 23 07:39:39 2018
New Revision: 473113
URL: https://svnweb.freebsd.org/changeset/ports/473113

Log:
  Fix math/freemat with Clang6.
  
  Noticed by CMake 3.12 fallout. Fixed the C++ issues before I noticed that
  the port was marked DEPRECATED. Porting FreeMat to llvm60 is doable, but
  probably not worth it given the state of upstream. For reference:
  	- s/llvm33/llvm60/ in the Makefile
  	- OwningPtr -> std::unique_ptr
  	- Some Clang includes have moved around
  	- The real issue is dealing with how the JIT changed between
  	  llvm33 and later versions.
  
  No PORTREVISION bump, since (a) deprecated (b) compile fix for a platform
  it didn't work on before and no code change where it did compile.

Added:
  head/math/freemat/files/patch-libs_libMatC_CArray.cpp   (contents, props changed)

Added: head/math/freemat/files/patch-libs_libMatC_CArray.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/freemat/files/patch-libs_libMatC_CArray.cpp	Sat Jun 23 07:39:39 2018	(r473113)
@@ -0,0 +1,20 @@
+--- libs/libMatC/CArray.cpp.orig	2018-06-22 09:05:35 UTC
++++ libs/libMatC/CArray.cpp
+@@ -534,7 +534,7 @@ void* carray_get_aa(void* interp, void* arg, void* rnd
+ extern "C" EXPORT
+ double carray_get_ss(void* interp, void* arg, double row, double col, bool *flag)
+ {
+-  if (*flag) return NULL;
++  if (*flag) return 0.0L;
+   try
+     {
+       CArray *cp = cast(arg);
+@@ -569,7 +569,7 @@ double carray_get_ss(void* interp, void* arg, double r
+ extern "C" EXPORT
+ double carray_get_s(void* interp, void* arg, double row, bool *flag)
+ {
+-  if (*flag) return NULL;
++  if (*flag) return 0.0L;
+   try
+     {
+       CArray *cp = cast(arg);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806230739.w5N7ddSA022013>