| 1 |
commit: 91e8ffac654ffdb0d29bb35827e6ec0ff7ab977d |
| 2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 10:21:03 2018 +0000 |
| 4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 14:23:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e8ffac |
| 7 |
|
| 8 |
Revert "sci-physics/root: have root6 compile on Prefix." |
| 9 |
|
| 10 |
This reverts commit 0fa97fd6f71bb38beb26c4015a1bf6b02d6207d3. |
| 11 |
This broke the build with USE=opengl. |
| 12 |
|
| 13 |
.../root/files/root-6.12.06-disable-ftgl.patch | 45 ---------------------- |
| 14 |
sci-physics/root/root-6.12.06-r1.ebuild | 6 +-- |
| 15 |
2 files changed, 1 insertion(+), 50 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch b/sci-physics/root/files/root-6.12.06-disable-ftgl.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 89d8d550d30..00000000000 |
| 20 |
--- a/sci-physics/root/files/root-6.12.06-disable-ftgl.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,45 +0,0 @@ |
| 23 |
-Forwarded: https://sft.its.cern.ch/jira/browse/ROOT-9315 |
| 24 |
- |
| 25 |
-Index: root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake |
| 26 |
-=================================================================== |
| 27 |
---- root-6.12.06.orig/cmake/modules/SearchInstalledSoftware.cmake |
| 28 |
-+++ root-6.12.06/cmake/modules/SearchInstalledSoftware.cmake |
| 29 |
-@@ -1075,22 +1075,24 @@ if(globus) |
| 30 |
- endif() |
| 31 |
- |
| 32 |
- #---Check for ftgl if needed---------------------------------------------------------- |
| 33 |
--if(NOT builtin_ftgl) |
| 34 |
-- find_package(FTGL) |
| 35 |
-- if(NOT FTGL_FOUND) |
| 36 |
-- if(fail-on-missing) |
| 37 |
-- message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location") |
| 38 |
-- else() |
| 39 |
-- message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation") |
| 40 |
-- message(STATUS "For the time being switching ON 'builtin_ftgl' option") |
| 41 |
-- set(builtin_ftgl ON CACHE BOOL "" FORCE) |
| 42 |
-+if(buildgl) |
| 43 |
-+ if(NOT builtin_ftgl) |
| 44 |
-+ find_package(FTGL) |
| 45 |
-+ if(NOT FTGL_FOUND) |
| 46 |
-+ if(fail-on-missing) |
| 47 |
-+ message(FATAL_ERROR "ftgl library not found and is required ('builtin_ftgl' is OFF). Set varible FTGL_ROOT_DIR to installation location") |
| 48 |
-+ else() |
| 49 |
-+ message(STATUS "ftgl library not found. Set variable FTGL_ROOT_DIR to point to your installation") |
| 50 |
-+ message(STATUS "For the time being switching ON 'builtin_ftgl' option") |
| 51 |
-+ set(builtin_ftgl ON CACHE BOOL "" FORCE) |
| 52 |
-+ endif() |
| 53 |
- endif() |
| 54 |
- endif() |
| 55 |
--endif() |
| 56 |
--if(builtin_ftgl) |
| 57 |
-- set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc) |
| 58 |
-- set(FTGL_CFLAGS -DBUILTIN_FTGL) |
| 59 |
-- set(FTGL_LIBRARIES FTGL) |
| 60 |
-+ if(builtin_ftgl) |
| 61 |
-+ set(FTGL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/graf3d/ftgl/inc) |
| 62 |
-+ set(FTGL_CFLAGS -DBUILTIN_FTGL) |
| 63 |
-+ set(FTGL_LIBRARIES FTGL) |
| 64 |
-+ endif() |
| 65 |
- endif() |
| 66 |
- |
| 67 |
- #---Check for chirp-------------------------------------------------------------------- |
| 68 |
|
| 69 |
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild |
| 70 |
index 6f44ce517b4..c0815302e7d 100644 |
| 71 |
--- a/sci-physics/root/root-6.12.06-r1.ebuild |
| 72 |
+++ b/sci-physics/root/root-6.12.06-r1.ebuild |
| 73 |
@@ -9,7 +9,7 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 74 |
FORTRAN_NEEDED="fortran" |
| 75 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 76 |
|
| 77 |
-inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils prefix \ |
| 78 |
+inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils \ |
| 79 |
python-single-r1 toolchain-funcs user versionator xdg-utils |
| 80 |
|
| 81 |
DESCRIPTION="C++ data analysis framework and interpreter from CERN" |
| 82 |
@@ -115,7 +115,6 @@ PATCHES=( |
| 83 |
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch |
| 84 |
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch |
| 85 |
"${FILESDIR}"/${PN}-6.12.04-z3.patch |
| 86 |
- "${FILESDIR}"/${PN}-6.12.06-disable-ftgl.patch |
| 87 |
) |
| 88 |
|
| 89 |
pkg_setup() { |
| 90 |
@@ -152,8 +151,6 @@ src_prepare() { |
| 91 |
|
| 92 |
# CSS should use local images |
| 93 |
sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed" |
| 94 |
- |
| 95 |
- hprefixify build/CMakeLists.txt core/clingutils/CMakeLists.txt |
| 96 |
} |
| 97 |
|
| 98 |
# Note: ROOT uses bundled LLVM, because it is patched and API-incompatible with system LLVM. |
| 99 |
@@ -165,7 +162,6 @@ src_configure() { |
| 100 |
-DCMAKE_C_FLAGS="${CFLAGS}" |
| 101 |
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" |
| 102 |
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/${MY_PREFIX}" |
| 103 |
- -DDEFAULT_SYSROOT="${EPREFIX}" # for llvm system headers |
| 104 |
-Dexplicitlink=ON |
| 105 |
-Dexceptions=ON |
| 106 |
-Dfail-on-missing=ON |
Archives