| 1 |
commit: febb7b197dd214a577942eddcc0096984ec0b8d3 |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Fri Dec 3 23:11:36 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 4 21:52:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febb7b19 |
| 7 |
|
| 8 |
media-gfx/freecad: don't fail if oce and occ are both installed |
| 9 |
|
| 10 |
Switch a cmake option, to allow proper configuration if both |
| 11 |
sci-libs/oce and sci-libs/opencascade are installed. |
| 12 |
This allows to further simplify opencascade related logic. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/827936 |
| 15 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 16 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
media-gfx/freecad/freecad-0.19.2-r5.ebuild | 11 ----------- |
| 20 |
1 file changed, 11 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild |
| 23 |
index df0faac7f980..c9287ed91fa5 100644 |
| 24 |
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild |
| 25 |
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild |
| 26 |
@@ -223,17 +223,6 @@ src_configure() { |
| 27 |
# Use the version of shiboken2 that matches the selected python version |
| 28 |
-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" |
| 29 |
-DPython3_EXECUTABLE=${PYTHON} |
| 30 |
- |
| 31 |
- -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo |
| 32 |
- ) |
| 33 |
- |
| 34 |
- # bug https://bugs.gentoo.org/788274 |
| 35 |
- local OCC_P=$(best_version sci-libs/opencascade[vtk]) |
| 36 |
- OCC_P=${OCC_P#sci-libs/} |
| 37 |
- OCC_P=${OCC_P%-r*} |
| 38 |
- mycmakeargs+=( |
| 39 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P} |
| 40 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P} |
| 41 |
) |
| 42 |
|
| 43 |
if use debug; then |
Archives