Date: Thu, 5 Oct 2023 23:05:47 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0a24e084c54a - main - science/openmodelica: update 1.20.0 =?utf-8?Q?=E2=86=92?= 1.22.0-beta-1 Message-ID: <202310052305.395N5lrV063217@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a24e084c54a0b3bbb1d922a32bc99914f91f30f commit 0a24e084c54a0b3bbb1d922a32bc99914f91f30f Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-10-05 23:05:06 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-10-05 23:05:43 +0000 science/openmodelica: update 1.20.0 → 1.22.0-beta-1 Reported by: portscout --- science/openmodelica/Makefile | 58 +++++++++------------- science/openmodelica/distinfo | 42 +++++++--------- science/openmodelica/files/gcc.sh | 3 -- ...MIL_ThirdParty_Expat_expat-2.1.0_CMakeLists.txt | 10 ---- ...ty_Ipopt-3.13.4_ThirdParty_MUMPS_CMakeLists.txt | 11 ---- .../patch-OMCompiler_Compiler_boot_CMakeLists.txt | 13 ----- ...atch-OMCompiler_Compiler_runtime_CMakeLists.txt | 4 +- ...atch-OMCompiler_Compiler_runtime_settingsimpl.c | 20 -------- .../patch-OMCompiler_Compiler_runtime_systemimpl.c | 8 +-- ...SimulationRuntime_c_meta_meta__modelica__segv.c | 28 +++++++++++ .../patch-OMEdit_OMEditLIB_Util_Utilities.cpp | 4 +- ...ch-OMSimulator_OMTLMSimulator_3rdParty_Makefile | 11 ---- .../patch-OMSimulator_OMTLMSimulator_Makefile.head | 15 ------ ...LMSimulator_common_Communication_TLMCommUtil.cc | 11 ---- ...atch-OMSimulator_OMTLMSimulator_common_Makefile | 24 --------- science/openmodelica/pkg-plist | 29 ++++++----- 16 files changed, 94 insertions(+), 197 deletions(-) diff --git a/science/openmodelica/Makefile b/science/openmodelica/Makefile index 922d980c1d05..bbee26adc1d2 100644 --- a/science/openmodelica/Makefile +++ b/science/openmodelica/Makefile @@ -1,15 +1,9 @@ PORTNAME= openmodelica -DISTVERSIONPREFIX= v -DISTVERSION= 1.20.0 -PORTREVISION= 2 +#DISTVERSIONPREFIX= v +DISTVERSION= 1.22.0-beta-1 CATEGORIES= science cad java -MASTER_SITES= https://build.openmodelica.org/omc/bootstrap/:bootstrap -DISTFILES= sources.tar.gz:bootstrap DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES= 01b6764df51f4f097d1c2e093e945ebd9a2f15a3.patch:-p1 # backport of https://github.com/OpenModelica/OpenModelica/pull/10261 - MAINTAINER= yuri@FreeBSD.org COMMENT= Modelica-based modeling and simulation environment WWW= https://openmodelica.org/ @@ -35,7 +29,7 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ RUN_DEPENDS= bash:shells/bash \ gmake:devel/gmake -USES= cmake compiler:c++14-lang dos2unix iconv fortran gettext-runtime gl gnome blaslapack localbase:ldflags qt:5 pkgconfig python:build shebangfix +USES= cmake compiler:c++14-lang iconv fortran gettext-runtime gl gnome blaslapack localbase:ldflags qt:5 readline pkgconfig python:build shebangfix USE_QT= concurrent core gui network opengl printsupport svg webkit widgets xml xmlpatterns buildtools:build qmake:build USE_GL= gl opengl USE_GNOME= libxml2 @@ -45,27 +39,21 @@ USE_LDCONFIG= ${PREFIX}/lib/omc ${PREFIX}/lib/omc/OMSimulator ${PREFIX}/lib/omc/ USE_GITHUB= yes GH_ACCOUNT= OpenModelica GH_PROJECT= OpenModelica - -DOS2UNIX_FILES= OMSimulator/OMTLMSimulator/3rdParty/Makefile \ - OMCompiler/3rdParty/FMIL/ThirdParty/Expat/expat-2.1.0/CMakeLists.txt +GH_TAGNAME= v1.22.0-dev.beta.1 SHEBANG_GLOB= *.sh *.in *.ac -SHEBANG_FILES= OMSimulator/OMTLMSimulator/OMFMISimulatorWrapper/StartTLMOMFMISimulatorWrapper \ - OMSimulator/OMTLMSimulator/Hopsan/StartTLMHopsan \ - OMSimulator/testsuite/tlm/StartTLMFmiWrapper \ - OMSimulator/OMTLMSimulator/FMIWrapper/StartTLMFmiWrapper \ - OMSimulator/OMTLMSimulator/OpenModelica/StartTLMOpenModelica - -GH_TUPLE= \ - OpenModelica:OMOptim:4116ef7:OMOptim/OMOptim \ - OpenModelica:OpenModelica-common:08a0180:OMOptim_common/OMOptim/common \ - OpenModelica:OMSimulator:af996ad:OMSimulator/OMSimulator \ - OpenModelica:OMSimulator-3rdParty:6202ca1:OMSimulator_3rdParty/OMSimulator/3rdParty \ - OpenModelica:OMTLMSimulator:07d5353:OMSimulator_OMTLMSimulator/OMSimulator/OMTLMSimulator \ - OpenModelica:OMCompiler-3rdParty:a60ba6c:OMCompiler_3rdParty/OMCompiler/3rdParty \ - OpenModelica:OMSens:66b920b:OMSens/OMSens \ - OpenModelica:OMSens_Qt:ef85128:OMSens_Qt/OMSens_Qt - #OpenModelica:OpenModelica-common:08a0180:OMSens_Qt_common/OMSens_Qt/common + +GH_TUPLE= \ + OpenModelica:OMOptim:55102095970c73a4176820538d19aaf408515da9:OpenModelica_OMOptim/OMOptim \ + OpenModelica:OMSimulator:634b0193a3eb14e75622a8e720bf0fb6dab77487:OpenModelica_OMSimulator/OMSimulator \ + OpenModelica:OMSimulator-3rdParty:b4c3aa4a16a5920e88096780498cc4af157f3c05:OpenModelica_OMSimulator_3rdParty/OMSimulator/3rdParty \ + OpenModelica:OMCompiler-3rdParty:ad7c7b11370e8faf08b720010f40846c53adfed5:OpenModelica_OMCompiler_3rdParty/OMCompiler/3rdParty \ + OpenModelica:OMSens:8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d:OpenModelica_OMSens/OMSens \ + OpenModelica:OMSens_Qt:ff2ade18e7058f611ddfd575ccbd24f388615d3f:OpenModelica_OMSens_Qt/OMSens_Qt \ + OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMOptim/common \ + OpenModelica:OpenModelica-common:08a01802db5ba5edb540383c46718b89ff229ef2:OpenModelica_OpenModelica_common/OMSens_Qt/common +GH_TUPLE+= OpenModelica:OMBootstrapping:c233b75:bootstrapping/OMCompiler/Compiler/boot/bomc # downloaded by cmake + # this should change make program everywhere, but it doesn't, # hence the patches in OMCompiler/Compiler/runtime/CMakeLists.txt, OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp @@ -76,7 +64,7 @@ CMAKE_ARGS+= -DOM_USE_CCACHE:BOOL=${CCACHE_ENABLED:S/yes/ON/:S/no/OFF/} # if ref LDFLAGS+= -lexecinfo -lintl -pthread -BINARY_ALIAS= make=${GMAKE} gcc=${FILESDIR}/gcc.sh git=false +BINARY_ALIAS= make=${GMAKE} CONFLICTS_BUILD= sundials @@ -85,9 +73,9 @@ post-extract: @${FIND} ${WRKSRC} -name "*.orig" -delete # remove rtime that isn't used on FreeBSD @${RM} -r ${WRKSRC}/OMSimulator/OMTLMSimulator/3rdParty/rtime - # create symlink for sources.tar.gz - @${MKDIR} ${WRKSRC}/OMCompiler/Compiler/boot/bomc - @${LN} -s ${DISTDIR}/${DIST_SUBDIR}/sources.tar.gz ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz + # prevent bootstrap file download + #${MKDIR} ${WRKSRC}/bomc + ${TOUCH} ${WRKSRC}/OMCompiler/Compiler/boot/bomc/sources.tar.gz # workaround for broken fetch @${RLN} ${WRKSRC}/OMOptim/common ${WRKSRC}/OMSens_Qt/common @@ -103,8 +91,8 @@ post-patch: post-install: # workaround for https://github.com/OpenModelica/OpenModelica/issues/9919 - cd ${STAGEDIR}${PREFIX} && ${CHMOD} +x \ - bin/OMSimulator bin/OMSimulatorPython3 bin/StartTLMFmiWrapper + #cd ${STAGEDIR}${PREFIX} && ${CHMOD} +x \ + # bin/OMSimulator bin/OMSimulatorPython3 bin/StartTLMFmiWrapper # remove unnecessary files ${RM} -r \ ${STAGEDIR}${PREFIX}/share/zmq \ @@ -113,7 +101,7 @@ post-install: # remove empty directories ${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete # strip binaries - cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ + #cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \ bin/OMSimulator bin/FMIWrapper \ lib/omc/OMSimulator/libomtlmsimulator.so lib/omc/OMSimulator/libOMSimulator.so \ lib/omc/libomtlmsimulator.so lib/omc/libOMSimulator.so diff --git a/science/openmodelica/distinfo b/science/openmodelica/distinfo index 75b84eb1434f..48174a6801d0 100644 --- a/science/openmodelica/distinfo +++ b/science/openmodelica/distinfo @@ -1,23 +1,19 @@ -TIMESTAMP = 1677352146 -SHA256 (openmodelica-1.20.0/sources.tar.gz) = d41b20ccb9395189fa1edd6dd86ae09023571876f2504904366a91d3491a8c19 -SIZE (openmodelica-1.20.0/sources.tar.gz) = 3322762 -SHA256 (openmodelica-1.20.0/OpenModelica-OpenModelica-v1.20.0_GH0.tar.gz) = 0b04923cc4d0b5d9e29679864a1d1b8e6ec8ecd7f456779dfe5212886f644f5c -SIZE (openmodelica-1.20.0/OpenModelica-OpenModelica-v1.20.0_GH0.tar.gz) = 92236817 -SHA256 (openmodelica-1.20.0/OpenModelica-OMOptim-4116ef7_GH0.tar.gz) = 6562015ccf8c8042fe7a8b881bdd3d4237dea4b6d4ed95e1eadeb5338521a911 -SIZE (openmodelica-1.20.0/OpenModelica-OMOptim-4116ef7_GH0.tar.gz) = 4021972 -SHA256 (openmodelica-1.20.0/OpenModelica-OpenModelica-common-08a0180_GH0.tar.gz) = ef6045612777ede7cab882ca1bd665ba5c6d5ebfa4760be3bf797558d71fd9fe -SIZE (openmodelica-1.20.0/OpenModelica-OpenModelica-common-08a0180_GH0.tar.gz) = 36101 -SHA256 (openmodelica-1.20.0/OpenModelica-OMSimulator-af996ad_GH0.tar.gz) = ba33fed5de32e0957060caef6742048037f0f47cd90f6bb7630efb4ba0944740 -SIZE (openmodelica-1.20.0/OpenModelica-OMSimulator-af996ad_GH0.tar.gz) = 87888293 -SHA256 (openmodelica-1.20.0/OpenModelica-OMSimulator-3rdParty-6202ca1_GH0.tar.gz) = f1c7320dd8b8bf491a8fe24157e7b79a879740834422b418654f8ccea06f329f -SIZE (openmodelica-1.20.0/OpenModelica-OMSimulator-3rdParty-6202ca1_GH0.tar.gz) = 12841559 -SHA256 (openmodelica-1.20.0/OpenModelica-OMTLMSimulator-07d5353_GH0.tar.gz) = 0ae4867efb68e6452f55470c35f8b10ce4ff374a57204595225e0ac75f7acec3 -SIZE (openmodelica-1.20.0/OpenModelica-OMTLMSimulator-07d5353_GH0.tar.gz) = 45578453 -SHA256 (openmodelica-1.20.0/OpenModelica-OMCompiler-3rdParty-a60ba6c_GH0.tar.gz) = cca8f2516d8c4f84c5bf5199e1c7c9ff36165f6ed97f27c7679550178c9655a7 -SIZE (openmodelica-1.20.0/OpenModelica-OMCompiler-3rdParty-a60ba6c_GH0.tar.gz) = 41909764 -SHA256 (openmodelica-1.20.0/OpenModelica-OMSens-66b920b_GH0.tar.gz) = f0982350a9ea20a24e1be408fbadd9562373a29cbdecb8a9981a5562b24af73c -SIZE (openmodelica-1.20.0/OpenModelica-OMSens-66b920b_GH0.tar.gz) = 8870024 -SHA256 (openmodelica-1.20.0/OpenModelica-OMSens_Qt-ef85128_GH0.tar.gz) = a6db8a107098a1f2c999923e020a5f337485a00057771ac9407a8af373278493 -SIZE (openmodelica-1.20.0/OpenModelica-OMSens_Qt-ef85128_GH0.tar.gz) = 210584 -SHA256 (openmodelica-1.20.0/01b6764df51f4f097d1c2e093e945ebd9a2f15a3.patch) = 8a112c6efbc063425a1f8090955e44cf1b933d05ad523a028c5df55adb358d55 -SIZE (openmodelica-1.20.0/01b6764df51f4f097d1c2e093e945ebd9a2f15a3.patch) = 1038 +TIMESTAMP = 1696532157 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-1.22.0-beta-1-v1.22.0-dev.beta.1_GH0.tar.gz) = 4358acdc10d0d902d7498b0def26d5478ffaf76cb9e876b7eb5cb5f1787668d5 +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-1.22.0-beta-1-v1.22.0-dev.beta.1_GH0.tar.gz) = 92733670 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = c972df0280e3abb689db11bfa34832f54ba81be65a7f9079150b8cbd8f515fe9 +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMOptim-55102095970c73a4176820538d19aaf408515da9_GH0.tar.gz) = 4022723 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = fd063d0b7921a45d38cf0c63bbeb53f3f66206632fae4e1aadfb1b9f334b3492 +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-634b0193a3eb14e75622a8e720bf0fb6dab77487_GH0.tar.gz) = 87881474 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = a5dd5a4ea2494471db0ff5879a966666606685beb952ee50b06a362f0c5d841f +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSimulator-3rdParty-b4c3aa4a16a5920e88096780498cc4af157f3c05_GH0.tar.gz) = 7636640 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMCompiler-3rdParty-ad7c7b11370e8faf08b720010f40846c53adfed5_GH0.tar.gz) = 48ac1743b6b6f8f0972da40224e43555ef9700fa300c380ce94314175d2679ca +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMCompiler-3rdParty-ad7c7b11370e8faf08b720010f40846c53adfed5_GH0.tar.gz) = 50216263 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = db2171ae5603314edf05728a40f4df31ca4c9107a6fed0cd2208a080455696e2 +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSens-8216eaefbb4ea2ff0c7a17a3487dcc2a8a17667d_GH0.tar.gz) = 8870122 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 95eac1349089f887e47a02d818c5aa626f505255e0b7c2a31b94b95fc8cd2504 +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMSens_Qt-ff2ade18e7058f611ddfd575ccbd24f388615d3f_GH0.tar.gz) = 211270 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = fdb5bb442da0375373ef221cf26195114bf149511c1c2be051caad6301c21c9a +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2_GH0.tar.gz) = 36148 +SHA256 (openmodelica-1.22.0.b.1/OpenModelica-OMBootstrapping-c233b75_GH0.tar.gz) = 1a866e9f8eb925a68593c004efc4d59a0ad564bb438fc2752c667f1422f23d6f +SIZE (openmodelica-1.22.0.b.1/OpenModelica-OMBootstrapping-c233b75_GH0.tar.gz) = 3327673 diff --git a/science/openmodelica/files/gcc.sh b/science/openmodelica/files/gcc.sh deleted file mode 100755 index c9ce337f84fd..000000000000 --- a/science/openmodelica/files/gcc.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/bin/cc "$@" -I/usr/local/include -L/usr/local/lib diff --git a/science/openmodelica/files/patch-OMCompiler_3rdParty_FMIL_ThirdParty_Expat_expat-2.1.0_CMakeLists.txt b/science/openmodelica/files/patch-OMCompiler_3rdParty_FMIL_ThirdParty_Expat_expat-2.1.0_CMakeLists.txt deleted file mode 100644 index ca01e0fea225..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_3rdParty_FMIL_ThirdParty_Expat_expat-2.1.0_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- OMCompiler/3rdParty/FMIL/ThirdParty/Expat/expat-2.1.0/CMakeLists.txt.orig 2022-12-10 10:46:09 UTC -+++ OMCompiler/3rdParty/FMIL/ThirdParty/Expat/expat-2.1.0/CMakeLists.txt -@@ -62,6 +62,7 @@ else(BUILD_shared) - endif(BUILD_shared) - - add_library(expat ${_SHARED} ${expat_SRCS}) -+target_include_directories(expat PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lib) - - if(NOT BUILD_shared) - target_compile_definitions(expat PUBLIC XML_STATIC) diff --git a/science/openmodelica/files/patch-OMCompiler_3rdParty_Ipopt-3.13.4_ThirdParty_MUMPS_CMakeLists.txt b/science/openmodelica/files/patch-OMCompiler_3rdParty_Ipopt-3.13.4_ThirdParty_MUMPS_CMakeLists.txt deleted file mode 100644 index 4bc9b79ee2e1..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_3rdParty_Ipopt-3.13.4_ThirdParty_MUMPS_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- OMCompiler/3rdParty/Ipopt-3.13.4/ThirdParty/MUMPS/CMakeLists.txt.orig 2022-12-09 19:22:30 UTC -+++ OMCompiler/3rdParty/Ipopt-3.13.4/ThirdParty/MUMPS/CMakeLists.txt -@@ -143,7 +143,7 @@ endif () - target_link_libraries(coinmumps PUBLIC ${LAPACK_LIBRARIES}) - - if(THREADS_HAVE_PTHREAD_ARG) -- target_compile_options(coinmumps PUBLIC pthread) -+ target_compile_options(coinmumps PUBLIC ${CMAKE_THREAD_LIBS_INIT}) - endif() - if(CMAKE_THREAD_LIBS_INIT) - target_link_libraries(coinmumps PUBLIC ${CMAKE_THREAD_LIBS_INIT}) diff --git a/science/openmodelica/files/patch-OMCompiler_Compiler_boot_CMakeLists.txt b/science/openmodelica/files/patch-OMCompiler_Compiler_boot_CMakeLists.txt deleted file mode 100644 index 3ceec5fe1769..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_Compiler_boot_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- OMCompiler/Compiler/boot/CMakeLists.txt.orig 2022-12-12 07:29:42 UTC -+++ OMCompiler/Compiler/boot/CMakeLists.txt -@@ -9,9 +9,9 @@ else() - file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bomc/) - file(DOWNLOAD https://build.openmodelica.org/omc/bootstrap/sources.tar.gz - ${CMAKE_CURRENT_SOURCE_DIR}/bomc/sources.tar.gz SHOW_PROGRESS) -+endif() - execute_process(COMMAND tar xzf sources.tar.gz - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bomc/) --endif() - - # OpenModelicaBootstrappingHeader.h should probably be added to source control and - # updated just like the bootstrap-source c files. diff --git a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt index 5ea89f69a1c1..e4efc44b1f1b 100644 --- a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt +++ b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_CMakeLists.txt @@ -1,6 +1,6 @@ ---- OMCompiler/Compiler/runtime/CMakeLists.txt.orig 2022-12-11 22:46:50 UTC +--- OMCompiler/Compiler/runtime/CMakeLists.txt.orig 2023-04-14 14:33:28 UTC +++ OMCompiler/Compiler/runtime/CMakeLists.txt -@@ -242,7 +242,11 @@ endif() +@@ -234,7 +234,11 @@ endif() if (MINGW) set(OMC_MAKE_EXE "mingw32-make") else() diff --git a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_settingsimpl.c b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_settingsimpl.c deleted file mode 100644 index f00d516472ef..000000000000 --- a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_settingsimpl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- OMCompiler/Compiler/runtime/settingsimpl.c.orig 2022-12-10 10:59:38 UTC -+++ OMCompiler/Compiler/runtime/settingsimpl.c -@@ -90,7 +90,7 @@ const char* SettingsImpl__getInstallationDirectoryPath - return path &&*path ? path : "OPENMODELICA_BOOTSTRAPPING_STAGE_NO_OPENMODELICAHOME"; - } - #else --#if (defined(__linux__) || defined(__APPLE_CC__)) -+#if (defined(__linux__) || defined(__APPLE_CC__) || defined(__FreeBSD__)) - /* Helper function to strip /bin/... or /lib/... from the executable path of omc */ - static void stripbinpath(char *omhome) - { -@@ -112,7 +112,7 @@ static void stripbinpath(char *omhome) - #endif - - /* Do not free or modify the returned variable of getInstallationDirectoryPath. It's part of the environment! */ --#if defined(__linux__) || defined(__APPLE_CC__) -+#if defined(__linux__) || defined(__APPLE_CC__) || defined(__FreeBSD__) - #include <dlfcn.h> - - const char* SettingsImpl__getInstallationDirectoryPath(void) { diff --git a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_systemimpl.c b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_systemimpl.c index c54f136f2489..9492fab582b3 100644 --- a/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_systemimpl.c +++ b/science/openmodelica/files/patch-OMCompiler_Compiler_runtime_systemimpl.c @@ -1,16 +1,16 @@ - make it single-threaded as a workaround for https://github.com/OpenModelica/OpenModelica/issues/9922 ---- OMCompiler/Compiler/runtime/systemimpl.c.orig 2022-12-11 20:16:40 UTC +--- OMCompiler/Compiler/runtime/systemimpl.c.orig 2023-04-14 14:33:28 UTC +++ OMCompiler/Compiler/runtime/systemimpl.c -@@ -775,6 +775,7 @@ char* System_popen(threadData_t *threadData, const cha +@@ -772,6 +772,7 @@ char* System_popen(threadData_t *threadData, const cha int System_numProcessors(void) { -+#if 0 ++#if 1 #if WITH_HWLOC==1 hwloc_topology_t topology; if (0==hwloc_topology_init(&topology) && 0==hwloc_topology_load(topology)) { -@@ -793,6 +794,8 @@ int System_numProcessors(void) +@@ -790,6 +791,8 @@ int System_numProcessors(void) #else return intMax(sysconf(_SC_NPROCESSORS_ONLN), 1); #endif diff --git a/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c b/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c new file mode 100644 index 000000000000..f53fd11e2c14 --- /dev/null +++ b/science/openmodelica/files/patch-OMCompiler_SimulationRuntime_c_meta_meta__modelica__segv.c @@ -0,0 +1,28 @@ +- replace the pthread_getattr_np function + +--- OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c.orig 2023-10-04 02:19:12 UTC ++++ OMCompiler/SimulationRuntime/c/meta/meta_modelica_segv.c +@@ -35,6 +35,10 @@ + /* for pthread_getattr_np */ + #endif + ++#if defined(__FreeBSD__) ++#include <pthread_np.h> ++#endif ++ + #include "meta_modelica.h" + + void* mmc_getStacktraceMessages_threadData(threadData_t *threadData) +@@ -192,7 +196,12 @@ static void* getStackBase() { + size_t size = 0; + pthread_attr_t sattr; + pthread_attr_init(&sattr); ++#if defined(__FreeBSD__) ++ pthread_attr_init(&sattr); ++ pthread_attr_get_np(self, &sattr); ++#elif defined(OS_LINUX) + pthread_getattr_np(self, &sattr); ++#endif + assert(0==pthread_attr_getstack(&sattr, &stackBottom, &size)); + assert(stackBottom); + pthread_attr_destroy(&sattr); diff --git a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp b/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp index b90236c4886e..24df8db90a43 100644 --- a/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp +++ b/science/openmodelica/files/patch-OMEdit_OMEditLIB_Util_Utilities.cpp @@ -1,6 +1,6 @@ ---- OMEdit/OMEditLIB/Util/Utilities.cpp.orig 2022-12-11 19:01:44 UTC +--- OMEdit/OMEditLIB/Util/Utilities.cpp.orig 2023-04-14 14:33:28 UTC +++ OMEdit/OMEditLIB/Util/Utilities.cpp -@@ -1012,7 +1012,7 @@ QIcon Utilities::FileIconProvider::FileIconProviderImp +@@ -1019,7 +1019,7 @@ QIcon Utilities::FileIconProvider::FileIconProviderImp // Get icon from OS. QIcon icon; // File icons are unknown on linux systems. diff --git a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_3rdParty_Makefile b/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_3rdParty_Makefile deleted file mode 100644 index 42b3257f4054..000000000000 --- a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_3rdParty_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- OMSimulator/OMTLMSimulator/3rdParty/Makefile.orig 2022-12-11 02:57:08 UTC -+++ OMSimulator/OMTLMSimulator/3rdParty/Makefile -@@ -8,7 +8,7 @@ ifeq ($(detected_OS),Darwin) - #Dont build rtime on Mac - buildlibs=misc/src - else -- buildlibs=misc/src rtime -+ buildlibs=misc/src - endif - else - # This is for BEAST diff --git a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_Makefile.head b/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_Makefile.head deleted file mode 100644 index 3449b2493dad..000000000000 --- a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_Makefile.head +++ /dev/null @@ -1,15 +0,0 @@ ---- OMSimulator/OMTLMSimulator/Makefile.head.orig 2022-12-11 03:25:38 UTC -+++ OMSimulator/OMTLMSimulator/Makefile.head -@@ -100,7 +100,12 @@ ifeq ($(detected_OS),Darwin) - EXTRAFLAGS += -DNO_RTIME - RTIMELIB = - else -+ifeq ($(detected_OS),FreeBSD) -+EXTRAFLAGS += -DNO_RTIME -+RTIMELIB = -+else - RTIMELIB = -lrtime -+endif - endif - - override CC += $(CFLAGS) $(EXTRAFLAGS) diff --git a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Communication_TLMCommUtil.cc b/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Communication_TLMCommUtil.cc deleted file mode 100644 index 3c92ea110570..000000000000 --- a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Communication_TLMCommUtil.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- OMSimulator/OMTLMSimulator/common/Communication/TLMCommUtil.cc.orig 2022-12-11 03:21:23 UTC -+++ OMSimulator/OMTLMSimulator/common/Communication/TLMCommUtil.cc -@@ -42,7 +42,7 @@ void TLMCommUtil::SendMessage(TLMMessage& mess) { - TLMCommUtil::ByteSwap(&mess.Header.TLMInterfaceID, sizeof(mess.Header.TLMInterfaceID)); - } - --#if defined( WIN32) || defined(__APPLE__) -+#if defined( WIN32) || defined(__APPLE__) || defined(__FreeBSD__) - const int MSG_MORE = 0; - #endif - diff --git a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Makefile b/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Makefile deleted file mode 100644 index 0d4c1a538ad5..000000000000 --- a/science/openmodelica/files/patch-OMSimulator_OMTLMSimulator_common_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- OMSimulator/OMTLMSimulator/common/Makefile.orig 2022-12-11 03:01:49 UTC -+++ OMSimulator/OMTLMSimulator/common/Makefile -@@ -13,7 +13,7 @@ endif - include $(MAKEFILEHEADHOME)/Makefile.head - - MISCHOME = ../3rdParty/misc --TIMEHOME = ../3rdParty/rtime -+#TIMEHOME = ../3rdParty/rtime - - SRCCLT= Plugin/PluginImplementer.cc \ - Plugin/MonitoringPluginImplementer.cc \ -@@ -74,11 +74,10 @@ OBJS = $(SRC:%.cc=$(ABI)/%.o) - - INCLUDES= -I. \ - -I$(MISCHOME)/include \ -- -I$(TIMEHOME) \ -+ -DNO_RTIME \ - $(INCLPTHREAD) - - LIBS = -L$(MISCHOME)/lib/$(ABI) \ -- -L$(TIMEHOME)/lib/$(ABI) \ - -L$(ABI) \ - -lmisc $(RTIMELIB) - diff --git a/science/openmodelica/pkg-plist b/science/openmodelica/pkg-plist index 2d1b53adea18..47f67927512b 100644 --- a/science/openmodelica/pkg-plist +++ b/science/openmodelica/pkg-plist @@ -1,11 +1,10 @@ -bin/FMIWrapper bin/OMEdit bin/OMNotebook bin/OMPlot bin/OMShell +bin/OMShell-terminal bin/OMSimulator bin/OMSimulatorPython3 -bin/StartTLMFmiWrapper bin/omc bin/omc-diff include/omc/FMI/fmi_import_context.h @@ -118,9 +117,9 @@ include/omc/JM/jm_string_set.h include/omc/JM/jm_types.h include/omc/JM/jm_vector.h include/omc/JM/jm_vector_template.h -include/omc/OMSimulator.h +include/omc/OMSimulator/OMSimulator.h +include/omc/OMSimulator/Types.h include/omc/ParModelica/auto/om_pm_interface.hpp -include/omc/Types.h include/omc/c/ModelicaUtilities.h include/omc/c/dataReconciliation/dataReconciliation.h include/omc/c/fmi-export/fmu1_model_interface.c.inc @@ -152,6 +151,7 @@ include/omc/c/openmodelica_types.h include/omc/c/optimization/OptimizerData.h include/omc/c/optimization/OptimizerInterface.h include/omc/c/optimization/OptimizerLocalFunction.h +include/omc/c/simulation/jacobian_util.h include/omc/c/simulation/modelinfo.h include/omc/c/simulation/omc_simulation_util.h include/omc/c/simulation/options.h @@ -200,6 +200,7 @@ include/omc/c/simulation/solver/mixedSearchSolver.h include/omc/c/simulation/solver/mixedSystem.h include/omc/c/simulation/solver/model_help.h include/omc/c/simulation/solver/newtonIteration.h +include/omc/c/simulation/solver/newton_diagnostics.h include/omc/c/simulation/solver/nonlinearSolverHomotopy.h include/omc/c/simulation/solver/nonlinearSolverHybrd.h include/omc/c/simulation/solver/nonlinearSolverNewton.h @@ -214,6 +215,7 @@ include/omc/c/simulation/solver/solver_main.h include/omc/c/simulation/solver/spatialDistribution.h include/omc/c/simulation/solver/stateset.h include/omc/c/simulation/solver/sundials_error.h +include/omc/c/simulation/solver/sundials_util.h include/omc/c/simulation/solver/sym_solver_ssc.h include/omc/c/simulation/solver/synchronous.h include/omc/c/simulation_data.h @@ -226,7 +228,6 @@ include/omc/c/util/doubleEndedList.h include/omc/c/util/generic_array.h include/omc/c/util/index_spec.h include/omc/c/util/integer_array.h -include/omc/c/util/jacobian_util.h include/omc/c/util/java_interface.h include/omc/c/util/jni.h include/omc/c/util/jni_md.h @@ -653,6 +654,9 @@ include/omc/zconf.h include/omc/zlib.h include/omc/zmq.h include/omc/zmq_utils.h +lib/omc/AnnotationsBuiltin_1_x.mo +lib/omc/AnnotationsBuiltin_2_x.mo +lib/omc/AnnotationsBuiltin_3_x.mo lib/omc/MetaModelicaBuiltin.mo lib/omc/ModelicaBuiltin.mo lib/omc/NFModelicaBuiltin.mo @@ -664,8 +668,6 @@ lib/omc/OMSimulator/System.py lib/omc/OMSimulator/Types.py lib/omc/OMSimulator/__init__.py lib/omc/OMSimulator/capi.py -lib/omc/OMSimulator/libOMSimulator.so -lib/omc/OMSimulator/libomtlmsimulator.so lib/omc/PDEModelicaBuiltin.mo lib/omc/cpp/libOMCppCVode.so lib/omc/cpp/libOMCppDASSL.so @@ -685,7 +687,7 @@ lib/omc/cpp/libOMCppModelicaUtilities.so lib/omc/cpp/libOMCppModelicaUtilities_static.a lib/omc/cpp/libOMCppNewton.so lib/omc/cpp/libOMCppNewton_static.a -lib/omc/cpp/libOMCppOMCFactory.so +lib/omc/cpp/libOMCppOMCFactory.a lib/omc/cpp/libOMCppSimController.so lib/omc/cpp/libOMCppSimulationSettings.so lib/omc/cpp/libOMCppSolver.so @@ -725,10 +727,10 @@ lib/omc/liblis.a lib/omc/libmetis.a lib/omc/libomcgc.so lib/omc/libomcruntime.a -lib/omc/libomtlmsimulator.so -lib/omc/libqwt.so -lib/omc/libqwt.so.6 -lib/omc/libqwt.so.6.1.5 +lib/omc/libomqwt.so +lib/omc/libomqwt.so.6 +lib/omc/libomqwt.so.6.1.5 +lib/omc/libomsensplugin.so lib/omc/libsuitesparseconfig.a lib/omc/libsundials_arkode.a lib/omc/libsundials_cvode.a @@ -823,6 +825,7 @@ share/omc/sources/c/gc/memory_pool.c share/omc/sources/c/gc/omc_gc.c share/omc/sources/c/math-support/pivot.c share/omc/sources/c/meta/meta_modelica_catch.c +share/omc/sources/c/simulation/jacobian_util.c share/omc/sources/c/simulation/omc_simulation_util.c share/omc/sources/c/simulation/options.c share/omc/sources/c/simulation/simulation_info_json.c @@ -855,7 +858,6 @@ share/omc/sources/c/util/doubleEndedList.c share/omc/sources/c/util/generic_array.c share/omc/sources/c/util/index_spec.c share/omc/sources/c/util/integer_array.c -share/omc/sources/c/util/jacobian_util.c share/omc/sources/c/util/list.c share/omc/sources/c/util/modelica_string.c share/omc/sources/c/util/modelica_string_lit.c @@ -873,6 +875,7 @@ share/omc/sources/c/util/simulation_options.c share/omc/sources/c/util/string_array.c share/omc/sources/c/util/utility.c share/omc/sources/c/util/varinfo.c +share/omnotebook/OMNotebookHelp.onb share/omnotebook/commands.xml share/omnotebook/drmodelica/AccessControl/AccessDemo.onb share/omnotebook/drmodelica/AccessControl/Exercise1.onb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310052305.395N5lrV063217>