diff options
| author |   Guilherme Amadio <amadio@gentoo.org> | 2018-03-22 13:44:39 +0100 |
|---|---|---|
| committer | Guilherme Amadio <amadio@gentoo.org> | 2018-03-22 15:23:31 +0100 |
| commit | 0644d83de67b352bf88de744264143d5ad1bd4ce (patch) | |
| tree | 85ddf1535621f5dcf2fdaf0eafe9dcc999f3c189 /sci-physics | |
| parent | Revert "sci-physics/root: have root6 compile on Prefix." (diff) | |
| download | gentoo-0644d83de67b352bf88de744264143d5ad1bd4ce.tar.gz gentoo-0644d83de67b352bf88de744264143d5ad1bd4ce.tar.bz2 gentoo-0644d83de67b352bf88de744264143d5ad1bd4ce.zip | |
sci-physics/root: do not look for ftgl and gl2ps with USE=-opengl
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/root/files/root-6.12.04-no-opengl.patch | 23 | ||||
| -rw-r--r-- | sci-physics/root/root-6.12.06-r1.ebuild | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch new file mode 100644 index 000000000000..319020222e53 --- /dev/null +++ b/sci-physics/root/files/root-6.12.04-no-opengl.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake +index a68c462eb3..1e82e57241 100644 +--- a/cmake/modules/SearchInstalledSoftware.cmake ++++ b/cmake/modules/SearchInstalledSoftware.cmake +@@ -499,7 +499,7 @@ if(opengl) + endif() + + #---Check for gl2ps ------------------------------------------------------------------ +-if(NOT builtin_gl2ps) ++if(gl2ps AND NOT builtin_gl2ps) + message(STATUS "Looking for gl2ps") + find_Package(gl2ps) + if(NOT GL2PS_FOUND) +@@ -999,7 +999,7 @@ if(globus) + endif() + + #---Check for ftgl if needed---------------------------------------------------------- +-if(NOT builtin_ftgl) ++if(ftgl AND NOT builtin_ftgl) + find_package(FTGL) + if(NOT FTGL_FOUND) + if(fail-on-missing) + diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild index c0815302e7df..1908822d66c8 100644 --- a/sci-physics/root/root-6.12.06-r1.ebuild +++ b/sci-physics/root/root-6.12.06-r1.ebuild @@ -114,6 +114,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.00.01-dotfont.patch "${FILESDIR}"/${PN}-6.11.02-hsimple.patch "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch + "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch "${FILESDIR}"/${PN}-6.12.04-z3.patch ) |