projects
/
gentoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
614fa86
)
dev-libs/poco: Drop duplicate cmake-utils_src_prepare call
author
Andreas Sturmlechner
<asturm@gentoo.org>
Fri, 11 Oct 2019 18:26:08 +0000
(20:26 +0200)
committer
Andreas Sturmlechner
<asturm@gentoo.org>
Fri, 11 Oct 2019 18:28:33 +0000
(20:28 +0200)
Conflict resolution mistake
Closes: https://bugs.gentoo.org/697502
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
dev-libs/poco/poco-1.9.0-r2.ebuild
patch
|
blob
|
history
diff --git
a/dev-libs/poco/poco-1.9.0-r2.ebuild
b/dev-libs/poco/poco-1.9.0-r2.ebuild
index af5af0d7e30f549a1478aff73e4bbbdcfa826242..f2c9dd98dac662ab91d904a6e1fef38c72392ef1 100644
(file)
--- a/
dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/
dev-libs/poco/poco-1.9.0-r2.ebuild
@@
-82,8
+82,6
@@
src_prepare() {
# Add missing directory that breaks the build
mkdir -p Encodings/testsuite/data || die
- cmake-utils_src_prepare
-
if ! use iodbc ; then
sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
fi