| 1 |
commit: f20185d9e99d291dcc416c109c6141eb5c09ebe1 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 28 09:24:06 2015 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 09:29:16 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20185d9 |
| 7 |
|
| 8 |
dev-util/cmake: Added FindPkgConfig variable dereference fix |
| 9 |
|
| 10 |
to 3.2.x branch as well. Did some whitespace/quoting fixes |
| 11 |
in the 3.3.1-r1 ebuild. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.20.1 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
.../cmake/{cmake-3.3.1-r1.ebuild => cmake-3.2.3-r1.ebuild} | 13 +++++-------- |
| 17 |
dev-util/cmake/cmake-3.3.1-r1.ebuild | 4 ++-- |
| 18 |
2 files changed, 7 insertions(+), 10 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.2.3-r1.ebuild |
| 21 |
similarity index 91% |
| 22 |
copy from dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 23 |
copy to dev-util/cmake/cmake-3.2.3-r1.ebuild |
| 24 |
index a2cda8a..0b02576 100644 |
| 25 |
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 26 |
+++ b/dev-util/cmake/cmake-3.2.3-r1.ebuild |
| 27 |
@@ -7,16 +7,14 @@ EAPI=5 |
| 28 |
CMAKE_REMOVE_MODULES="no" |
| 29 |
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
| 30 |
|
| 31 |
-MY_P="${P/_/-}" |
| 32 |
- |
| 33 |
DESCRIPTION="Cross platform Make" |
| 34 |
HOMEPAGE="http://www.cmake.org/" |
| 35 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz |
| 36 |
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz |
| 37 |
http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" |
| 38 |
|
| 39 |
LICENSE="CMake" |
| 40 |
SLOT="0" |
| 41 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 42 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 43 |
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 44 |
|
| 45 |
RDEPEND=" |
| 46 |
@@ -42,8 +40,6 @@ DEPEND="${RDEPEND} |
| 47 |
doc? ( dev-python/sphinx ) |
| 48 |
" |
| 49 |
|
| 50 |
-S="${WORKDIR}/${MY_P}" |
| 51 |
- |
| 52 |
SITEFILE="50${PN}-gentoo.el" |
| 53 |
|
| 54 |
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 55 |
@@ -64,8 +60,9 @@ PATCHES=( |
| 56 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 57 |
"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
| 58 |
|
| 59 |
- #upstream fixes (can usually be removed with a version bump) |
| 60 |
- "${DISTDIR}/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" |
| 61 |
+ # upstream backports |
| 62 |
+ "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch |
| 63 |
+ "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch |
| 64 |
) |
| 65 |
|
| 66 |
cmake_src_bootstrap() { |
| 67 |
|
| 68 |
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 69 |
index a2cda8a..69601e9 100644 |
| 70 |
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 71 |
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild |
| 72 |
@@ -64,8 +64,8 @@ PATCHES=( |
| 73 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 74 |
"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
| 75 |
|
| 76 |
- #upstream fixes (can usually be removed with a version bump) |
| 77 |
- "${DISTDIR}/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" |
| 78 |
+ # upstream fixes (can usually be removed with a version bump) |
| 79 |
+ "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch |
| 80 |
) |
| 81 |
|
| 82 |
cmake_src_bootstrap() { |
Archives