diff options
| author | Steve Wills <swills@FreeBSD.org> | 2019-05-09 20:07:39 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2019-05-09 20:07:39 +0000 |
| commit | 9ecfcd3649162c82a269c68b0420d6009ea09b33 (patch) | |
| tree | 6a26baf4fc766d55192a5a2cfa3b8374878c24e5 /math/libnormaliz | |
| parent | f22c95631e53a4162cb55b26d2f109a82a4b5961 (diff) | |
Notes
Diffstat (limited to 'math/libnormaliz')
| -rw-r--r-- | math/libnormaliz/Makefile | 18 | ||||
| -rw-r--r-- | math/libnormaliz/distinfo | 6 | ||||
| -rw-r--r-- | math/libnormaliz/files/patch-source_libnormaliz_nmz__integral.cpp | 11 |
3 files changed, 12 insertions, 23 deletions
diff --git a/math/libnormaliz/Makefile b/math/libnormaliz/Makefile index a034f5b6d848..b1f9e44de08d 100644 --- a/math/libnormaliz/Makefile +++ b/math/libnormaliz/Makefile @@ -2,8 +2,7 @@ PORTNAME= libnormaliz DISTVERSIONPREFIX= v -DISTVERSION= 3.6.3 -PORTREVISION= 2 +DISTVERSION= 3.7.2 CATEGORIES= math MAINTAINER= phascolarctos@protonmail.ch @@ -15,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/dynamic_bitset.hpp:devel/boost-libs \ ${LOCALBASE}/include/gmpxx.h:math/gmp -USES= compiler:c++11-lang gmake +USES= autoreconf compiler:c++11-lang gmake libtool USE_GITHUB= yes GH_ACCOUNT= Normaliz @@ -26,18 +25,19 @@ INSTALL_WRKSRC= ${WRKSRC}/source/libnormaliz CXXFLAGS+= -I ${LOCALBASE}/include MAKEFILE= Makefile.classic +GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= COCOA DOCS FLINT OPENMP COCOA_DESC= Link with libcocoa.a (might cause circular dependency) -FLINT_DESC= Link with libflint.a COCOA_BUILD_DEPENDS= ${LOCALBASE}/lib/libcocoa.a:math/cocoalib -COCOA_CXXFLAGS= -DNMZ_COCOA -DCoCoA_THREADSAFE_HACK -COCOA_LDFLAGS= ${LOCALBASE}/lib -lcocoa +COCOA_CONFIGURE_ENABLE= nmzintegrate +FLINT_DESC= Link with libflint.so FLINT_BUILD_DEPENDS= ${LOCALBASE}/lib/libflint.so:math/flint2 -FLINT_CXXFLAGS= -DNMZ_FLINT -FLINT_LDFLAGS= -L ${LOCALBASE}/lib -lflint -lmpfr +FLINT_CONFIGURE_ENABLE= flint +FLINT_LDFLAGS= -lpthread OPENMP_BUILD_DEPENDS= ${LOCALBASE}/lib/libomp.so:devel/openmp -OPENMP_CXXFLAGS= -fopenmp +OPENMP_CONFIGURE_ENABLE= openmp do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/libnormaliz diff --git a/math/libnormaliz/distinfo b/math/libnormaliz/distinfo index 1cac8ad0dda4..c7c234cce52c 100644 --- a/math/libnormaliz/distinfo +++ b/math/libnormaliz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536314303 -SHA256 (Normaliz-Normaliz-v3.6.3_GH0.tar.gz) = 1c3dad1f5256c92dde21b0eea1423afe95d98863c90f5e4cb429ffa71ba57f54 -SIZE (Normaliz-Normaliz-v3.6.3_GH0.tar.gz) = 9923720 +TIMESTAMP = 1557398323 +SHA256 (Normaliz-Normaliz-v3.7.2_GH0.tar.gz) = 90137933ea7f90209ba3065c9055e564e30bf42cf75d0609fc913c65e0a6de6a +SIZE (Normaliz-Normaliz-v3.7.2_GH0.tar.gz) = 4515223 diff --git a/math/libnormaliz/files/patch-source_libnormaliz_nmz__integral.cpp b/math/libnormaliz/files/patch-source_libnormaliz_nmz__integral.cpp deleted file mode 100644 index 65acc64a4c04..000000000000 --- a/math/libnormaliz/files/patch-source_libnormaliz_nmz__integral.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- source/libnormaliz/nmz_integral.cpp.orig 2018-09-25 05:50:07 UTC -+++ source/libnormaliz/nmz_integral.cpp -@@ -403,7 +403,7 @@ try{ - vector<Integer> test_grading=C.getSublattice().to_sublattice_dual_no_div(C.getGrading()); - Integer corr_factor=v_gcd(test_grading); - mpz_class corr_mpz=convertTo<mpz_class>(corr_factor); -- I*=BigInt(corr_mpz.get_mpz_t()); -+ I*=BigIntFromMPZ(corr_mpz.get_mpz_t()); - - string result="Integral"; - if(do_virt_mult) |