gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

media-gfx/freecad: use die instead of rm -f, use ESYSROOT

Browse Source 
We don't checkout src/CXX from git.

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43984
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Paul Zander
2025-08-28 16:23:59 +02:00
committed by Sam James
parent 7302c17e5c
commit 688b8ac75e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media-gfx/freecad/freecad-1.0.2.ebuild
View File

@@ -269,7 +269,9 @@ src_prepare() {
sed -e 's#pcl/point_traits.h#pcl/type_traits.h#g' -i src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp || die
# removed bundled pycxx
rm -rf src/CXX
if [[ ${PV} != *9999* ]]; then
rm -r src/CXX || die "remove bundled pycxx"
fi
cmake_src_prepare
}
@@ -294,8 +296,8 @@ src_configure() {
-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
-DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program
-DPYCXX_INCLUDE_DIR="${EPREFIX}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
-DPYCXX_SOURCE_DIR="${EPREFIX}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX"
-DPYCXX_INCLUDE_DIR="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
-DPYCXX_SOURCE_DIR="${ESYSROOT}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX"
-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory

8
media-gfx/freecad/freecad-9999.ebuild
View File

@@ -270,7 +270,9 @@ src_prepare() {
-i src/Mod/Fem/femguiutils/data_extraction.py || die
# removed bundled pycxx
rm -rf src/CXX
if [[ ${PV} != *9999* ]]; then
rm -r src/CXX || die "remove bundled pycxx"
fi
cmake_src_prepare
}
@@ -295,8 +297,8 @@ src_configure() {
-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
-DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program
-DPYCXX_INCLUDE_DIR="${EPREFIX}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
-DPYCXX_SOURCE_DIR="${EPREFIX}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX"
-DPYCXX_INCLUDE_DIR="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
-DPYCXX_SOURCE_DIR="${ESYSROOT}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX"
-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory