diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2016-03-04 06:37:34 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2016-03-04 06:37:34 +0900 |
| commit | ee818b85645c675224e0313707f9ebf72d2fe4cb (patch) | |
| tree | 354454f2fc6791d643c70470d2881826f9eab357 /dev-util | |
| parent | dev-utils/cmake/files/cmake-3.0.0-prefix-dirs.patch: fix typo. (diff) | |
| download | android-ee818b85645c675224e0313707f9ebf72d2fe4cb.tar.gz android-ee818b85645c675224e0313707f9ebf72d2fe4cb.tar.bz2 android-ee818b85645c675224e0313707f9ebf72d2fe4cb.zip | |
dev-utils/cmake: locate Qt4 inside $EPREFIX.
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/cmake-3.4.3.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-3.3.2-FindQt4.patch | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dev-util/cmake/cmake-3.4.3.ebuild b/dev-util/cmake/cmake-3.4.3.ebuild index acd76b8..2de6794 100644 --- a/dev-util/cmake/cmake-3.4.3.ebuild +++ b/dev-util/cmake/cmake-3.4.3.ebuild @@ -5,7 +5,7 @@ EAPI=5 CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx prefix MY_P="${P/_/-}" @@ -121,6 +121,8 @@ cmake_src_test() { src_prepare() { cmake-utils_src_prepare + eprefixify Modules/FindQt4.cmake + # disable running of cmake in boostrap command sed -i \ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch index 665c330..604cb22 100644 --- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch +++ b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch @@ -26,8 +26,8 @@ Gentoo-bug: 547222 + if(CMAKE_BUILD_TYPE STREQUAL Gentoo) + find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} + PATHS -+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin -+ /usr/bin ++ @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin ++ @GENTOO_PORTAGE_EPREFIX@/usr/bin + NO_DEFAULT_PATH + DOC "The qmake executable for the Qt installation to use" + ) |