From: "Ivan Lloro" <ivan.lloro.boada@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/
Date: Wed, 31 Jul 2024 23:31:44 +0000 (UTC) [thread overview]
Message-ID: <1722468693.cc72ffd0d43c22ed1dea9bf5786073846b823c59.ivan.lloro.boada@gentoo> (raw)
commit: cc72ffd0d43c22ed1dea9bf5786073846b823c59
Author: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
AuthorDate: Wed Jul 31 23:10:39 2024 +0000
Commit: Ivan Lloro <ivan.lloro.boada <AT> gmail <DOT> com>
CommitDate: Wed Jul 31 23:31:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cc72ffd0
sci-physics/openmodelica: Ensure graceful abort in case of any system command failure.
Signed-off-by: Ivan Lloro <ivan.lloro.boada <AT> gmail.com>
.../openmodelica/openmodelica-1.23.1.ebuild | 46 +++++++++++-----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
index 225275791..a4bbc0e6b 100644
--- a/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
+++ b/sci-physics/openmodelica/openmodelica-1.23.1.ebuild
@@ -91,21 +91,21 @@ PATCHES=(
src_unpack() {
default
- mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}"
- rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty"
- mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty"
- rmdir "${WORKDIR}/${P}/OMSens"
- mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens"
- rmdir "${WORKDIR}/${P}/OMSens_Qt"
- mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt"
- rmdir "${WORKDIR}/${P}/OMSens_Qt/common"
- mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common"
- rmdir "${WORKDIR}/${P}/OMSimulator"
- mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator"
- rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty"
- mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty"
- mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc"
- touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz"
+ mv "${WORKDIR}/OpenModelica-332e81aa6442c4cc4761251407332f86f80e834b" "${WORKDIR}/${P}" || die
+ rmdir "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+ mv "${WORKDIR}/OMCompiler-3rdParty-b826af1c1c15acf48627ad32cc0545ffc7e58bca" "${WORKDIR}/${P}/OMCompiler/3rdParty" || die
+ rmdir "${WORKDIR}/${P}/OMSens" || die
+ mv "${WORKDIR}/OMSens-0d804d597bc385686856d453cc830fad4923fa3e" "${WORKDIR}/${P}/OMSens" || die
+ rmdir "${WORKDIR}/${P}/OMSens_Qt" || die
+ mv "${WORKDIR}/OMSens_Qt-68b1b8697ac9f8e37ebe4de13c0c1d4e6e2e56fb" "${WORKDIR}/${P}/OMSens_Qt" || die
+ rmdir "${WORKDIR}/${P}/OMSens_Qt/common" || die
+ mv "${WORKDIR}/OpenModelica-common-08a01802db5ba5edb540383c46718b89ff229ef2" "${WORKDIR}/${P}/OMSens_Qt/common" || die
+ rmdir "${WORKDIR}/${P}/OMSimulator" || die
+ mv "${WORKDIR}/OMSimulator-1eb92ef35793b73e75d0cfed0c7b0311497d6278" "${WORKDIR}/${P}/OMSimulator" || die
+ rmdir "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+ mv "${WORKDIR}/OMSimulator-3rdParty-ca418d7768c036ac15e9894d7f00d2118b3399a6" "${WORKDIR}/${P}/OMSimulator/3rdParty" || die
+ mv "OMBootstrapping-c289e97c41d00939a4a69fe504961b47283a6d8e" "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc" || die
+ touch "${WORKDIR}/${P}/OMCompiler/Compiler/boot/bomc/sources.tar.gz" || die
}
src_configure() {
@@ -134,13 +134,13 @@ src_compile() {
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we compile it manually.
PWD=$(pwd)
cd "${WORKDIR}"/"${P}"/OMSens/fortran_interface
- gfortran -fPIC -c Rutf.for Rut.for Curvif.for
+ gfortran -fPIC -c Rutf.for Rut.for Curvif.for || die
# BUG: Undefined symbol curvif_ in
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# See with nm or objdump -tT
# ${WORKDIR}/${P}/OMSens/fortran_interface/curvif_simplified.cpython-312-x86_64-linux-gnu.so
# This bug causes "Vectorial Parameter Based Sensitivity Analysis" in OMSens to fail.
- f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90
+ f2py --verbose -c -I. Curvif.o Rutf.o Rut.o -m curvif_simplified curvif_simplified.pyf Curvif_simplified.f90 || die
cd "${PWD}"
cmake_src_compile
@@ -152,8 +152,8 @@ src_install() {
# [2024-07-15]
# OMSens is disabled in "${WORKDIR}/${P}/CMakeLists.txt" (## omc_add_subdirectory(OMSens)) due to lack of a
# working "${WORKDIR}/${P}/OMSens/CMakeLists.txt". So, we install it manually.
- cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/
- rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing}
+ cp -a "${WORKDIR}"/"${P}"/OMSens "${ED}"/usr/share/ || die
+ rm -fr "${ED}"/usr/share/OMSens/{old,.git,.gitignore,CMakeLists.txt,.jenkins,Jenkinsfile,Makefile.omdev.mingw,Makefile.unix,README.md,setup.py,testing} || die
newicon -s scalable OMShell/OMShell/OMShellGUI/Resources/omshell-large.svg omshell.svg
newicon -s scalable OMNotebook/OMNotebook/OMNotebookGUI/Resources/OMNotebook_icon.svg OMNotebook.svg
@@ -164,15 +164,15 @@ src_install() {
# Fix libraries
if [[ $(get_libdir) != "lib" ]]; then
- mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/
- rmdir "${ED}"/usr/lib/omc/
+ mv "${ED}"/usr/lib/omc/* "${ED}"/usr/$(get_libdir)/omc/ || die
+ rmdir "${ED}"/usr/lib/omc/ || die
dosym -r /usr/$(get_libdir)/omc /usr/lib/omc
fi
dosym -r /usr/include/omc/ParModelica /usr/include/ParModelica
# Documentation housekeeping & QA
- mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}"
- rm -fr "${ED}"/usr/doc
+ mv "${ED}"/usr/share/doc/omc "${ED}"/usr/share/doc/"${P}" || die
+ rm -fr "${ED}"/usr/doc || die
ewarn "Upstream has deprecated OMTLMSimuulator and, therefore, it has not been installed. Use OMSimulator/SSP instead."
}
next reply other threads:[~2024-07-31 23:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 23:31 Ivan Lloro [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-25 15:31 [gentoo-commits] repo/proj/guru:dev commit in: sci-physics/openmodelica/ Ivan Lloro
2024-10-25 15:24 Ivan Lloro
2024-08-13 17:04 Ivan Lloro
2024-08-12 17:03 Ivan Lloro
2024-08-11 14:43 Ivan Lloro
2024-08-06 17:43 Ivan Lloro
2024-08-05 18:54 Ivan Lloro
2024-08-05 18:46 Ivan Lloro
2024-08-05 17:48 Ivan Lloro
2024-08-05 17:37 Ivan Lloro
2024-08-05 17:21 Ivan Lloro
2024-08-05 14:18 Ivan Lloro
2024-08-05 13:44 Ivan Lloro
2024-08-05 9:36 Ivan Lloro
2024-08-04 19:51 Ivan Lloro
2024-08-04 18:24 Ivan Lloro
2024-08-04 18:24 Ivan Lloro
2024-07-31 23:31 Ivan Lloro
2024-07-31 23:31 Ivan Lloro
2024-07-30 18:42 Ivan Lloro
2024-07-30 16:00 Takuya Wakazono
2024-07-29 3:19 Ivan Lloro
2024-07-28 23:01 Ivan Lloro
2024-07-28 22:49 Ivan Lloro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1722468693.cc72ffd0d43c22ed1dea9bf5786073846b823c59.ivan.lloro.boada@gentoo \
--to=ivan.lloro.boada@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox