me/guix
Archived
1
0
Fork 0
Code Activity

gnu: freecad: Fix build.

Browse source 
* gnu/packages/patches/freecad-boost-serialization.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/engineering.scm (freecad) [source]: Use it.
[arguments]{#:configure-flags}: Turn it into a GEXP and adapt it.
This commit is contained in:
Mathieu Othacehe 2021-11-29 15:40:11 +01:00
parent 2d0c5e2477
commit 6805ab3290
No known key found for this signature in database
GPG key ID: 8354763531769CA6
3 changed files with 55 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1056,6 +1056,7 @@ dist_patch_DATA = \
%D%/packages/patches/fp16-system-libraries.patch \ %D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \ %D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/fplll-std-fenv.patch \ %D%/packages/patches/fplll-std-fenv.patch \
%D%/packages/patches/freecad-boost-serialization.patch \
%D%/packages/patches/freecad-vtk9.patch \ %D%/packages/patches/freecad-vtk9.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \

26
gnu/packages/engineering.scm
View file

@ -2381,7 +2381,8 @@ comments.")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0fhjv0x3dix1c7jml91yx63z9xifjlbhjbcdb73lw80smpxrq7mm")) (base32 "0fhjv0x3dix1c7jml91yx63z9xifjlbhjbcdb73lw80smpxrq7mm"))
(patches (search-patches "freecad-vtk9.patch")))) (patches (search-patches "freecad-vtk9.patch"
"freecad-boost-serialization.patch"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
`(("doxygen" ,doxygen) `(("doxygen" ,doxygen)
@ -2434,27 +2435,30 @@ comments.")))
(arguments (arguments
`(#:tests? #f ; Project has no tests `(#:tests? #f ; Project has no tests
#:configure-flags #:configure-flags
(list ,#~(list
"-DBUILD_QT5=ON" "-DBUILD_QT5=ON"
"-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_FLAT_MESH:BOOL=ON"
(string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") "-DBUILD_ENABLE_CXX_STD:STRING=C++17"
(string-append "-DCMAKE_INSTALL_LIBDIR=" #$output "/lib")
(string-append "-DPYSIDE2UICBINARY=" (string-append "-DPYSIDE2UICBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools") #$(this-package-native-input
"python-pyside-2-tools")
"/bin/uic") "/bin/uic")
(string-append "-DPYSIDE2RCCBINARY=" (string-append "-DPYSIDE2RCCBINARY="
(assoc-ref %build-inputs "python-pyside-2-tools") #$(this-package-native-input
"python-pyside-2-tools")
"/bin/rcc") "/bin/rcc")
"-DPYSIDE_LIBRARY=PySide2::pyside2" "-DPYSIDE_LIBRARY=PySide2::pyside2"
(string-append (string-append
"-DPYSIDE_INCLUDE_DIR=" "-DPYSIDE_INCLUDE_DIR="
(assoc-ref %build-inputs "python-pyside-2") "/include;" #$(this-package-input "python-pyside-2") "/include;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" #$(this-package-input "python-pyside-2") "/include/PySide2;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" #$(this-package-input "python-pyside-2") "/include/PySide2/QtCore;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" #$(this-package-input "python-pyside-2") "/include/PySide2/QtWidgets;"
(assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") #$(this-package-input "python-pyside-2") "/include/PySide2/QtGui;")
"-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
(string-append "-DSHIBOKEN_INCLUDE_DIR=" (string-append "-DSHIBOKEN_INCLUDE_DIR="
(assoc-ref %build-inputs "python-shiboken-2") #$(this-package-input "python-shiboken-2")
"/include/shiboken2")) "/include/shiboken2"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases

27
gnu/packages/patches/freecad-boost-serialization.patch Normal file
View file

@ -0,0 +1,27 @@
Taken from: https://github.com/archlinux/svntogit-community/blob/packages/freecad/trunk/freecad-boost.patch.
Index: FreeCAD-0.19.2/CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LI
SetupPCL()
SetupPybind11()
SetupBoost()
+ set(Boost_LIBRARIES_App ${Boost_LIBRARIES})
SetupXercesC()
find_package(ZLIB REQUIRED)
find_package(PyCXX REQUIRED)
Index: FreeCAD-0.19.2/src/App/CMakeLists.txt
===================================================================
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -59,7 +59,7 @@ include_directories(
set(FreeCADApp_LIBS
FreeCADBase
- ${Boost_LIBRARIES}
+ ${Boost_LIBRARIES_App}
)
if (BUILD_QT5)