diff options
| author |   Rolf Eike Beer <eike@sf-mail.de> | 2019-07-03 22:35:08 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-07-04 21:36:07 +0200 |
| commit | 4683e38d6d8e7dcc48307928b85102c1a1867361 (patch) | |
| tree | e7f032e57a80d044724ec2adb5f738d2a5352026 /dev-util | |
| parent | dev-util/cmake: 3.13.5 version bump, EAPI-7 bump (diff) | |
| download | gentoo-4683e38d6d8e7dcc48307928b85102c1a1867361.tar.gz gentoo-4683e38d6d8e7dcc48307928b85102c1a1867361.tar.bz2 gentoo-4683e38d6d8e7dcc48307928b85102c1a1867361.zip | |
dev-util/cmake: use correct pattern to undo cmake eclass modifications
Fixes: 6b7998b644e6f4469a7cb4c64776013a74363866
Closes: https://bugs.gentoo.org/686266
Closes: https://github.com/gentoo/gentoo/pull/12385
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12385
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/cmake-3.14.3.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.14.5.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-3.15.0_rc3.ebuild | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild index 42fd589bd81b..40c754212745 100644 --- a/dev-util/cmake/cmake-3.14.3.ebuild +++ b/dev-util/cmake/cmake-3.14.3.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die diff --git a/dev-util/cmake/cmake-3.14.5.ebuild b/dev-util/cmake/cmake-3.14.5.ebuild index 0ec739545d3b..e3507ad6196d 100644 --- a/dev-util/cmake/cmake-3.14.5.ebuild +++ b/dev-util/cmake/cmake-3.14.5.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die diff --git a/dev-util/cmake/cmake-3.15.0_rc3.ebuild b/dev-util/cmake/cmake-3.15.0_rc3.ebuild index b8f071ece70a..0fb93b78d73f 100644 --- a/dev-util/cmake/cmake-3.15.0_rc3.ebuild +++ b/dev-util/cmake/cmake-3.15.0_rc3.ebuild @@ -101,7 +101,7 @@ cmake_src_bootstrap() { cmake_src_test() { # fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die |