diff --git a/lang/lfortran/Makefile b/lang/lfortran/Makefile index 2e40337ba8e5..90eb5c60592e 100644 --- a/lang/lfortran/Makefile +++ b/lang/lfortran/Makefile @@ -1,47 +1,57 @@ PORTNAME= lfortran DISTVERSIONPREFIX= v -DISTVERSION= 0.18.0 -PORTREVISION= 2 +DISTVERSION= 0.19.0 CATEGORIES= lang MAINTAINER= fortran@FreeBSD.org COMMENT= Modern interactive Fortran compiler built on top of LLVM WWW= https://lfortran.org/ LICENSE= BSD3CLAUSE BROKEN_FreeBSD_12= use of undeclared identifier '_Unwind_Backtrace' BROKEN_i386= sizeof(YYSTYPE) != sizeof(Vec) BUILD_DEPENDS= bash:shells/bash \ re2c>0:devel/re2c \ dwarfdump:devel/dwarfdump \ rapidjson>0:devel/rapidjson LIB_DEPENDS= libfmt.so:devel/libfmt \ + libzstd.so:archivers/zstd \ libunwind.so:devel/libunwind \ libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} RUN_DEPENDS= dwarfdump:devel/dwarfdump USE_GITHUB= yes -USES= bison cmake:testing compiler:c++17-lang python:build shebangfix +USES= bison cmake:testing compiler:c++17-lang pkgconfig \ + python:build ssl shebangfix SHEBANG_FILES= *.sh BINARY_ALIAS= python=${PYTHON_CMD} -CMAKE_ON= LFORTRAN_BUILD_ALL WITH_DWARFDUMP WITH_FMT WITH_JSON WITH_LINKH WITH_LLVM WITH_UNWIND +CMAKE_ON= LFORTRAN_BUILD_ALL WITH_DWARFDUMP WITH_FMT WITH_JSON \ + WITH_LINKH WITH_LLVM WITH_STACKTRACE WITH_UNWIND -LLVM_VERSION= 11 +LLVM_VERSION= 15 OPTIONS_DEFINE= DOCS -# Xeus: version 2.4.1 is required -#LIB_DEPENDS+= libxeus.so:devel/xeus -#CMAKE_ON+= WITH_XEUS - -# BFD: /usr/local/include/bfd.h:2108:3: error: unknown type name 'ENUM_BITFIELD' -#USE_BINUTILS= yes -#CMAKE_ON+= WITH_BFD +# Xeus: version 3.0.5 is required and xeus-zmq 1.0.2 +# + xtl-quant-stack + cppzmq + nlohmann_json + LibUUID + libzmq4 +BUILD_DEPENDS+= xtl-quant-stack>=0.7:devel/xtl-quant-stack \ + nlohmann-json>0:devel/nlohmann-json \ + cppzmq>=4.8.1:net/cppzmq +LIB_DEPENDS+= libxeus.so:devel/xeus \ + libzmq.so:net/libzmq4 \ + libxeus-zmq.so:devel/xeus-zmq \ + libuuid.so:misc/e2fsprogs-libuuid +CMAKE_ON+= WITH_XEUS + +# BFD: +USE_BINUTILS= yes +CMAKE_ON+= WITH_BFD +LIB_DEPENDS+= libbfd-2.40.so:devel/binutils pre-configure: ${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/version .include diff --git a/lang/lfortran/distinfo b/lang/lfortran/distinfo index d8da96995604..835bd6e3a4b3 100644 --- a/lang/lfortran/distinfo +++ b/lang/lfortran/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667243059 -SHA256 (lfortran-lfortran-v0.18.0_GH0.tar.gz) = 6ec636580cb7e49e1cd68003850bba77dc4372d2eda3e3591d4bff6dffa31e7c -SIZE (lfortran-lfortran-v0.18.0_GH0.tar.gz) = 1713018 +TIMESTAMP = 1682782779 +SHA256 (lfortran-lfortran-v0.19.0_GH0.tar.gz) = d4aa69bfaecaee4523887a1747d565fb577c6c9f3663d15c86a29de3e7e87685 +SIZE (lfortran-lfortran-v0.19.0_GH0.tar.gz) = 2092717 diff --git a/lang/lfortran/files/patch-src_bin_CMakeLists.txt b/lang/lfortran/files/patch-src_bin_CMakeLists.txt deleted file mode 100644 index 10b23734303d..000000000000 --- a/lang/lfortran/files/patch-src_bin_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- src/bin/CMakeLists.txt.orig 2022-10-18 21:48:01 UTC -+++ src/bin/CMakeLists.txt -@@ -2,7 +2,9 @@ add_executable(lfortran lfortran.cpp) - target_include_directories(lfortran PRIVATE "tpl") - target_link_libraries(lfortran lfortran_lib) - if (LFORTRAN_STATIC_BIN) -- if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" -+ OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" -+ OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - # Link statically on Linux with gcc or clang - if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR - CMAKE_CXX_COMPILER_ID MATCHES Clang) -@@ -11,7 +13,9 @@ if (LFORTRAN_STATIC_BIN) - endif() - endif() - --if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" -+ OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" -+ OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - target_link_options(lfortran PRIVATE "LINKER:--export-dynamic") - endif() - diff --git a/lang/lfortran/files/patch-src_lfortran_tests_CMakeLists.txt b/lang/lfortran/files/patch-src_lfortran_tests_CMakeLists.txt deleted file mode 100644 index 6e02b1e24c67..000000000000 --- a/lang/lfortran/files/patch-src_lfortran_tests_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lfortran/tests/CMakeLists.txt.orig 2022-10-18 21:48:01 UTC -+++ src/lfortran/tests/CMakeLists.txt -@@ -43,7 +43,9 @@ target_link_libraries(test_lfortran lfortran_lib p::do - add_test(test_lfortran ${PROJECT_BINARY_DIR}/test_lfortran) - - if (WITH_LLVM) -- if (CMAKE_SYSTEM_NAME STREQUAL "Linux") -+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" -+ OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" -+ OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - target_link_options(test_lfortran PRIVATE "LINKER:--export-dynamic") - endif() - endif() diff --git a/lang/lfortran/pkg-plist b/lang/lfortran/pkg-plist index d5f4b83e65de..353bf2050a68 100644 --- a/lang/lfortran/pkg-plist +++ b/lang/lfortran/pkg-plist @@ -1,17 +1,18 @@ bin/lfortran %%DATADIR%%/lib/impure/lfortran_intrinsics.h %%DATADIR%%/lib/lfortran_intrinsic_bit.mod %%DATADIR%%/lib/lfortran_intrinsic_builtin.mod %%DATADIR%%/lib/lfortran_intrinsic_ieee_arithmetic.mod %%DATADIR%%/lib/lfortran_intrinsic_iso_c_binding.mod %%DATADIR%%/lib/lfortran_intrinsic_iso_fortran_env.mod %%DATADIR%%/lib/lfortran_intrinsic_kind.mod %%DATADIR%%/lib/lfortran_intrinsic_math.mod %%DATADIR%%/lib/lfortran_intrinsic_math2.mod %%DATADIR%%/lib/lfortran_intrinsic_math3.mod %%DATADIR%%/lib/lfortran_intrinsic_optimization.mod %%DATADIR%%/lib/lfortran_intrinsic_sin.mod %%DATADIR%%/lib/lfortran_intrinsic_string.mod %%DATADIR%%/lib/lfortran_intrinsic_trig.mod %%DATADIR%%/lib/liblfortran_runtime.so %%DATADIR%%/lib/liblfortran_runtime_static.a +share/jupyter/kernels/fortran/kernel.json