Date: Fri, 6 May 2016 21:45:19 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414732 - in head/math/scilab: . files Message-ID: <201605062145.u46LjJdx022451@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Fri May 6 21:45:19 2016 New Revision: 414732 URL: https://svnweb.freebsd.org/changeset/ports/414732 Log: Fix build with science/hdf5 version 1.10 by specifying that we want to use the version 1.8 API. Fix the build when the GUI option is disabled. Since this port installs icons, add INSTALLS_ICONS=yes to Makefile. PR: 209244 Approved by: makc (maintainer) Added: head/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h (contents, props changed) head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c (contents, props changed) head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c (contents, props changed) Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Fri May 6 21:32:09 2016 (r414731) +++ head/math/scilab/Makefile Fri May 6 21:45:19 2016 (r414732) @@ -27,6 +27,8 @@ USES= cpe desktop-file-utils fortran ge libtool pathfix pkgconfig shared-mime-info GNU_CONFIGURE= yes +INSTALLS_ICONS= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran \ @@ -118,7 +120,7 @@ CONFIGURE_ARGS+= --without-openmp .include <bsd.port.pre.mk> -.if ${JAVA_PORT_VERSION:M1.8.*} +.if ${PORT_OPTIONS:MGUI} && ${JAVA_PORT_VERSION:M1.8.*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif Added: head/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab/files/patch-modules_hdf5_includes_HDF5Objects.h Fri May 6 21:45:19 2016 (r414732) @@ -0,0 +1,19 @@ +--- modules/hdf5/includes/HDF5Objects.h.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/includes/HDF5Objects.h +@@ -13,15 +13,13 @@ + #ifndef __HDF5OBJECTS_H__ + #define __HDF5OBJECTS_H__ + +-#define H5_NO_DEPRECATED_SYMBOLS + #undef H5_USE_16_API ++#define H5_USE_18_API + + #define H5Eset_auto_vers 2 + #include <hdf5.h> + #include <hdf5_hl.h> + +-#undef H5_NO_DEPRECATED_SYMBOLS +- + //#define __HDF5OBJECTS_DEBUG__ + //#define __HDF5ERROR_PRINT__ + Added: head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile.c Fri May 6 21:45:19 2016 (r414732) @@ -0,0 +1,11 @@ +--- modules/hdf5/src/c/h5_readDataFromFile.c.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/src/c/h5_readDataFromFile.c +@@ -10,7 +10,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h> Added: head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab/files/patch-modules_hdf5_src_c_h5__readDataFromFile__v1.c Fri May 6 21:45:19 2016 (r414732) @@ -0,0 +1,11 @@ +--- modules/hdf5/src/c/h5_readDataFromFile_v1.c.orig 2015-03-31 09:31:29 UTC ++++ modules/hdf5/src/c/h5_readDataFromFile_v1.c +@@ -10,7 +10,7 @@ + * + */ + +-#define H5_NO_DEPRECATED_SYMBOLS ++#define H5_USE_18_API + + #ifndef _MSC_VER + #include <sys/time.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605062145.u46LjJdx022451>