diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile index a18a2615ccb8..0703a63eb69d 100644 --- a/devel/ikos/Makefile +++ b/devel/ikos/Makefile @@ -1,43 +1,43 @@ PORTNAME= ikos DISTVERSIONPREFIX= v DISTVERSION= 3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Static analyzer for C/C++ based on theory of abstract interpretation LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.pdf BUILD_DEPENDS= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION} LIB_DEPENDS= libapron.so:math/apron \ libboost_system.so:devel/boost-libs \ libmpfr.so:math/mpfr \ libgmp.so:math/gmp \ libppl.so:devel/ppl \ libtbb.so:devel/tbb RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USES= cmake ncurses python:3.6+ sqlite USE_GITHUB= yes GH_ACCOUNT= NASA-SW-VnV USE_LDCONFIG= yes LLVM_VERSION= 90 # ${LLVM_DEFAULT} isn't desirable here since ikos only supports llvm>=90, but LLVM_DEFAULT implies that many/any llvm versions are supported CXXFLAGS+= -DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG CMAKE_ON= BUILD_SHARED_LIBS CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE:PATH=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \ -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} post-configure: # workaround for the problem that --color-diagnostics gets into the linker command lines @${REINPLACE_CMD} 's|-Wl,--color-diagnostics| |' ${BUILD_WRKSRC}/build.ninja # use clang corresponding to the used llvm version CPP= clang-cpp${LLVM_VERSION} CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} .include diff --git a/math/apron/Makefile b/math/apron/Makefile index 19e1c06c373e..6bb03728c63c 100644 --- a/math/apron/Makefile +++ b/math/apron/Makefile @@ -1,52 +1,32 @@ PORTNAME= apron -DISTVERSION= 0.9.12 -DISTVERSIONSUFFIX= .r${SVN_REVISION} +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.13 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= APRON numerical abstract domain library LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_aarch64= ld: error: ../apron/libapron_debug.so: undefined reference to fpsetround -FETCH_DEPENDS= svn:devel/subversion LIB_DEPENDS= libgmp.so:math/gmp \ libmpfr.so:math/mpfr \ libppl.so:devel/ppl USES= gmake localbase:ldflags USE_LDCONFIG= yes -SVN_URL= svn://scm.gforge.inria.fr/svnroot/apron/apron/trunk -SVN_REVISION= 1104 - -do-fetch: - @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}" ]; then \ - ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \ - cd ${DISTDIR}/${DIST_SUBDIR} && \ - svn co -r ${SVN_REVISION} ${SVN_URL} ${PORTNAME}-${DISTVERSIONFULL} && \ - (cd ${PORTNAME}-${DISTVERSIONFULL} && ${RM} -r .svn) && \ - ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ - ${FIND} ${PORTNAME}-${DISTVERSIONFULL} -print0 | LC_ALL=C ${SORT} -z | \ - ${TAR} czf ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ - ${RM} -r ${PORTNAME}-${DISTVERSIONFULL}; \ - fi - -pre-build: - @${CP} ${WRKSRC}/Makefile.config.model ${WRKSRC}/Makefile.config - @${REINPLACE_CMD} -e ' \ - s|^APRON_PREFIX *=.*$$|APRON_PREFIX=${STAGEDIR}${LOCALBASE}|; \ - s|^HAS_OCAML *=.*$$|HAS_OCAML=|; \ - s|^HAS_OCAMLOPT *=.*$$|HAS_OCAMLOPT=|; \ - s|^OCAMLFIND *=.*$$|OCAMLFIND=|; \ - s|^# HAS_PPL *=.*$$|HAS_PPL=1|' \ - ${WRKSRC}/Makefile.config +HAS_CONFIGURE= yes +CONFIGURE_ARGS= -prefix ${STAGEDIR}${PREFIX} -no-ocaml -no-java + +USE_GITHUB= yes +GH_ACCOUNT= antoinemine post-stage: - @${RM} ${STAGEDIR}${LOCALBASE}/bin/*test* - @${RM} ${STAGEDIR}${LOCALBASE}/lib/*.a - @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/lib*.so + @${STRIP_CMD} \ + ${STAGEDIR}${LOCALBASE}/bin/* \ + ${STAGEDIR}${LOCALBASE}/lib/lib*.so .include diff --git a/math/apron/distinfo b/math/apron/distinfo index 90b71639da27..dc613a3ddb4a 100644 --- a/math/apron/distinfo +++ b/math/apron/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581280527 -SHA256 (apron-0.9.12.r1104.tar.gz) = 5249ebd06e274ca55c0ecc5cb0ed799f22eac5abd0a3f82388182f0107323aee -SIZE (apron-0.9.12.r1104.tar.gz) = 984719 +TIMESTAMP = 1630529475 +SHA256 (antoinemine-apron-v0.9.13_GH0.tar.gz) = 4af627e24623ab26948ea980077d015bfb9543374d857fbb42a8b6571e2fb36e +SIZE (antoinemine-apron-v0.9.13_GH0.tar.gz) = 988019 diff --git a/math/apron/files/patch-apron_Makefile b/math/apron/files/patch-apron_Makefile deleted file mode 100644 index b8363b6a3fb6..000000000000 --- a/math/apron/files/patch-apron_Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- apron/Makefile.orig 2018-12-14 19:17:40 UTC -+++ apron/Makefile -@@ -141,12 +141,12 @@ libapron_debug.a: $(O_FILES_DEBUG) ../it - $(RANLIB) $@ - - libapron.so: $(O_FILES) ../itv/libitv.a -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $(O_FILES) $(patsubst \ -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $(O_FILES) $(patsubst \ - %,../itv/%,$(filter %.o, $(shell $(AR) t \ - ../itv/libitv.a))) $(LDFLAGS) - - libapron_debug.so: $(O_FILES_DEBUG) ../itv/libitv_debug.a -- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $(O_FILES_DEBUG) \ -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $(O_FILES_DEBUG) \ - $(patsubst %,../itv/%,$(filter %.o, $(shell $(AR) t \ - ../itv/libitv_debug.a))) $(LDFLAGS) - diff --git a/math/apron/files/patch-box_Makefile b/math/apron/files/patch-box_Makefile deleted file mode 100644 index 076318ef355e..000000000000 --- a/math/apron/files/patch-box_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- box/Makefile.orig 2018-12-14 19:21:04 UTC -+++ box/Makefile -@@ -147,9 +147,9 @@ libbox%_debug.a: $(subst .c,%_debug.o,$( - $(AR) rcs $@ $^ - $(RANLIB) $@ - libbox%.so: $(subst .c,%.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) - libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) - - %MPQ.o: %.c - $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $< diff --git a/math/apron/files/patch-newpolka_Makefile b/math/apron/files/patch-newpolka_Makefile deleted file mode 100644 index f71ef4e9f2b3..000000000000 --- a/math/apron/files/patch-newpolka_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- newpolka/Makefile.orig 2018-12-14 19:21:39 UTC -+++ newpolka/Makefile -@@ -165,9 +165,9 @@ libpolka%_debug.a: $(subst .c,%_debug.o, - $(AR) rcs $@ $^ - $(RANLIB) $@ - libpolka%.so: $(subst .c,%.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) - libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) - - %Rl.o: %.c $(CCINC) - $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_LONGRAT -c -o $@ $< diff --git a/math/apron/files/patch-octagons_Makefile b/math/apron/files/patch-octagons_Makefile deleted file mode 100644 index b6d1bdf66dff..000000000000 --- a/math/apron/files/patch-octagons_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- octagons/Makefile.orig 2018-12-14 19:22:15 UTC -+++ octagons/Makefile -@@ -158,10 +158,10 @@ liboct%_debug.a: $(subst .c,%_debug.o,$( - $(RANLIB) $@ - - liboct%.so: $(subst .c,%.o,$(CCSOURCES)) -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) - - liboct%_debug.so: $(subst .c,%_debug.o,$(CCSOURCES)) -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) - - ifneq ($(HAS_SHARED),) - octtest%: oct_test%.o liboct%_debug.a liboct%_debug.so diff --git a/math/apron/files/patch-ppl_Makefile b/math/apron/files/patch-ppl_Makefile deleted file mode 100644 index 25642a68417f..000000000000 --- a/math/apron/files/patch-ppl_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- ppl/Makefile.orig 2018-12-14 19:22:48 UTC -+++ ppl/Makefile -@@ -105,9 +105,9 @@ libap_ppl_debug.a: $(subst .cc,_debug.o, - $(AR) rcs $@ $^ - $(RANLIB) $@ - libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES)) -- $(CXX_APRON_DYLIB) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) - libap_ppl_debug.so: $(subst .cc,_debug.o,$(CXXSOURCES)) -- $(CXX_APRON_DYLIB) $(CXXFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) -+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) $(LIBS_DEBUG) - - ifneq ($(HAS_SHARED),) - ap_ppl_test: libap_ppl_debug.so diff --git a/math/apron/files/patch-products_Makefile b/math/apron/files/patch-products_Makefile deleted file mode 100644 index d838193882a9..000000000000 --- a/math/apron/files/patch-products_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- products/Makefile.orig 1970-01-01 00:00:00 UTC -+++ products/Makefile -@@ -120,9 +120,9 @@ libap_pkgrid_debug.a: ap_pkgrid_debug.o - $(AR) rcs $@ $^ - $(RANLIB) $@ - libap_pkgrid.so: ap_pkgrid.o -- $(CXX_APRON_DYLIB) $(CXXFLAGS) -o $@ $^ -L../newpolka -lpolkaMPQ $(LDFLAGS) $(LIBS) -+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS) -o $@ $^ -L../newpolka -lpolkaMPQ $(LDFLAGS) $(LIBS) - libap_pkgrid_debug.so: ap_pkgrid_debug.o -- $(CXX_APRON_DYLIB) $(CXXFLAGS_DEBUG) -o $@ $^ -L../newpolka -lpolkaMPQ_debug $(LDFLAGS) $(LIBS_DEBUG) -+ $(CXX_APRON_DYLIB) -Wl,-soname,$@ $(CXXFLAGS_DEBUG) -o $@ $^ -L../newpolka -lpolkaMPQ_debug $(LDFLAGS) $(LIBS_DEBUG) - - #--------------------------------------- - # C rules diff --git a/math/apron/files/patch-taylor1plus_Makefile b/math/apron/files/patch-taylor1plus_Makefile deleted file mode 100644 index 18eb1941578b..000000000000 --- a/math/apron/files/patch-taylor1plus_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- taylor1plus/Makefile.orig 2018-12-14 19:24:08 UTC -+++ taylor1plus/Makefile -@@ -178,9 +178,9 @@ libt1p%_debug.a: $(subst .c,%_debug.o,$( - ## should work across all archs - ## - libt1p%.so: $(subst .c,%.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lbox$* -lpolkaMPQ $(LIBS) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS) -o $@ $^ $(LDFLAGS) -lbox$* -lpolkaMPQ $(LIBS) - libt1p%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c)) -- $(CC_APRON_DYLIB) $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) -lbox$*_debug -lpolkaMPQ_debug $(LIBS_DEBUG) -+ $(CC_APRON_DYLIB) -Wl,-soname,$@ $(CFLAGS_DEBUG) -o $@ $^ $(LDFLAGS) -lbox$*_debug -lpolkaMPQ_debug $(LIBS_DEBUG) - - %MPQ.o: %.c - $(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $< diff --git a/math/apron/pkg-plist b/math/apron/pkg-plist index a399a089f9a4..d158a8fc0111 100644 --- a/math/apron/pkg-plist +++ b/math/apron/pkg-plist @@ -1,90 +1,197 @@ +bin/ap_ppl_test +bin/octtestD +bin/octtestMPQ include/ap_abstract0.h include/ap_abstract1.h include/ap_coeff.h include/ap_config.h include/ap_dimension.h include/ap_disjunction.h include/ap_environment.h include/ap_expr0.h include/ap_expr1.h include/ap_generator0.h include/ap_generator1.h include/ap_generic.h include/ap_global0.h include/ap_global1.h include/ap_interval.h include/ap_lincons0.h include/ap_lincons1.h include/ap_linearize.h include/ap_linearize_aux.h include/ap_linexpr0.h include/ap_linexpr1.h include/ap_manager.h include/ap_pkgrid.h include/ap_policy.h include/ap_ppl.h include/ap_reducedproduct.h include/ap_scalar.h include/ap_tcons0.h include/ap_tcons1.h include/ap_texpr0.h include/ap_texpr1.h include/ap_var.h +include/ap_version.h +include/apronxx/apronxx.hh +include/apronxx/apxx_abstract0.hh +include/apronxx/apxx_abstract0_inline.hh +include/apronxx/apxx_abstract1.hh +include/apronxx/apxx_abstract1_inline.hh +include/apronxx/apxx_box.hh +include/apronxx/apxx_box_inline.hh +include/apronxx/apxx_coeff.hh +include/apronxx/apxx_coeff_inline.hh +include/apronxx/apxx_dimension.hh +include/apronxx/apxx_dimension_inline.hh +include/apronxx/apxx_environment.hh +include/apronxx/apxx_environment_inline.hh +include/apronxx/apxx_expr0.hh +include/apronxx/apxx_expr1.hh +include/apronxx/apxx_generator0.hh +include/apronxx/apxx_generator0_inline.hh +include/apronxx/apxx_generator1.hh +include/apronxx/apxx_generator1_inline.hh +include/apronxx/apxx_interval.hh +include/apronxx/apxx_interval_inline.hh +include/apronxx/apxx_lincons0.hh +include/apronxx/apxx_lincons0_inline.hh +include/apronxx/apxx_lincons1.hh +include/apronxx/apxx_lincons1_inline.hh +include/apronxx/apxx_linexpr0.hh +include/apronxx/apxx_linexpr0_inline.hh +include/apronxx/apxx_linexpr1.hh +include/apronxx/apxx_linexpr1_inline.hh +include/apronxx/apxx_manager.hh +include/apronxx/apxx_manager_inline.hh +include/apronxx/apxx_oct.hh +include/apronxx/apxx_oct_inline.hh +include/apronxx/apxx_polka.hh +include/apronxx/apxx_polka_inline.hh +include/apronxx/apxx_ppl.hh +include/apronxx/apxx_ppl_inline.hh +include/apronxx/apxx_ppl_product.hh +include/apronxx/apxx_ppl_product_inline.hh +include/apronxx/apxx_scalar.hh +include/apronxx/apxx_scalar_inline.hh +include/apronxx/apxx_t1p.hh +include/apronxx/apxx_t1p_inline.hh +include/apronxx/apxx_tcons0.hh +include/apronxx/apxx_tcons0_inline.hh +include/apronxx/apxx_tcons1.hh +include/apronxx/apxx_tcons1_inline.hh +include/apronxx/apxx_texpr0.hh +include/apronxx/apxx_texpr0_inline.hh +include/apronxx/apxx_texpr1.hh +include/apronxx/apxx_texpr1_inline.hh +include/apronxx/apxx_var.hh +include/apronxx/apxx_var_inline.hh include/bound.h include/bound_def.h include/box.h include/itv.h include/itv_config.h include/itv_fun.h include/itv_linearize.h include/itv_linexpr.h include/num.h include/num_config.h include/num_name.h include/num_numflt.h include/num_numint.h include/num_numrat.h include/numflt.h include/numflt_mpfr.h include/numflt_native.h include/numint.h include/numint_mpz.h include/numint_native.h include/numrat.h include/numrat_mpq.h include/numrat_native.h include/oct.h include/oct/oct_fun.h include/oct/oct_internal.h include/pk.h include/pkeq.h include/t1p.h +lib/libap_pkgrid.a lib/libap_pkgrid.so +lib/libap_pkgrid_debug.a lib/libap_pkgrid_debug.so +lib/libap_ppl.a lib/libap_ppl.so +lib/libap_ppl_debug.a lib/libap_ppl_debug.so +lib/libapron.a lib/libapron.so +lib/libapron_debug.a lib/libapron_debug.so +lib/libapronxx.a +lib/libapronxx.so +lib/libapronxx_debug.a +lib/libapronxx_debug.so +lib/libboxD.a lib/libboxD.so +lib/libboxD_debug.a lib/libboxD_debug.so +lib/libboxMPFR.a lib/libboxMPFR.so +lib/libboxMPFR_debug.a lib/libboxMPFR_debug.so +lib/libboxMPQ.a lib/libboxMPQ.so +lib/libboxMPQ_debug.a lib/libboxMPQ_debug.so +lib/libitv.a +lib/libitvD.a +lib/libitvD_debug.a +lib/libitvDl.a +lib/libitvDl_debug.a +lib/libitvIl.a +lib/libitvIl_debug.a +lib/libitvIll.a +lib/libitvIll_debug.a +lib/libitvMPFR.a +lib/libitvMPFR_debug.a +lib/libitvMPQ.a +lib/libitvMPQ_debug.a +lib/libitvMPZ.a +lib/libitvMPZ_debug.a +lib/libitvRl.a +lib/libitvRl_debug.a +lib/libitvRll.a +lib/libitvRll_debug.a +lib/libitv_debug.a +lib/liboctD.a lib/liboctD.so +lib/liboctD_debug.a lib/liboctD_debug.so +lib/liboctMPQ.a lib/liboctMPQ.so +lib/liboctMPQ_debug.a lib/liboctMPQ_debug.so +lib/libpolkaMPQ.a lib/libpolkaMPQ.so +lib/libpolkaMPQ_debug.a lib/libpolkaMPQ_debug.so +lib/libpolkaRll.a lib/libpolkaRll.so +lib/libpolkaRll_debug.a lib/libpolkaRll_debug.so +lib/libt1pD.a lib/libt1pD.so +lib/libt1pD_debug.a lib/libt1pD_debug.so +lib/libt1pMPFR.a lib/libt1pMPFR.so +lib/libt1pMPFR_debug.a lib/libt1pMPFR_debug.so +lib/libt1pMPQ.a lib/libt1pMPQ.so +lib/libt1pMPQ_debug.a lib/libt1pMPQ_debug.so lib/oct.idl lib/polka.idl lib/ppl.idl