From: Ekaitz Zarraga <ekaitz@elenq.tech>
To: 45059@debbugs.gnu.org, 43448@debbugs.gnu.org
Subject: [bug#45059] [PATCH] gnu: freecad: Fix compilation flags
Date: Sat, 05 Dec 2020 23:51:30 +0000 [thread overview]
Message-ID: <uukVWlWfdHgU2ykwn4t7VL8W2LnsEMneaz6ezoA0HHafPMBpWNLk-0WqMyzJmGYM-vNYBFMN7udZIFZ851kgAitatvvYf-yjE6QhbaK18Og=@elenq.tech> (raw)
Hi everyone,
I managed to solve the longstanding issue with freecad's compilation (#43448).
I'll submit a new change with the package update to 0.18.5 next.
Thanks
From d4d8a65679406b212c68d5198f239bdd71395541 Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Sun, 6 Dec 2020 00:43:36 +0100
Subject: [PATCH] gnu: freecad: Fix compilation flags
* gnu/packages/engineering.scm (freecad)[arguments]: Set correct
search paths in compilation flags. Fixes #43448
---
gnu/packages/engineering.scm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 558541dd5a..5a8977c940 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2496,8 +2496,28 @@ full programmatic control over your models.")
#:configure-flags
(list
"-DBUILD_QT5=ON"
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))
+ (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib")
+
+ (string-append "-DPYSIDE2UICBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/uic")
+ (string-append "-DPYSIDE2RCCBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/rcc")
+
+ "-DPYSIDE_LIBRARY=PySide2::pyside2"
+ (string-append
+ "-DPYSIDE_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-pyside-2") "/include;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
+
+ "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
+ (string-append "-DSHIBOKEN_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-shiboken-2")
+ "/include/shiboken2"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'restore-pythonpath
--
2.28.0
next reply other threads:[~2020-12-05 23:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 23:51 Ekaitz Zarraga [this message]
2020-12-05 23:58 ` [bug#45059] [PATCH 2/2] gnu: freecad: Update to 0.18.5 Ekaitz Zarraga
2020-12-06 21:29 ` bug#45059: [PATCH] gnu: freecad: Fix compilation flags Marius Bakke
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='uukVWlWfdHgU2ykwn4t7VL8W2LnsEMneaz6ezoA0HHafPMBpWNLk-0WqMyzJmGYM-vNYBFMN7udZIFZ851kgAitatvvYf-yjE6QhbaK18Og=@elenq.tech' \
--to=ekaitz@elenq.tech \
--cc=43448@debbugs.gnu.org \
--cc=45059@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).