summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-11-27 06:55:17 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-11-27 06:55:17 +0300
commit9594d319cf4fdade1b82bca417d9b24aff1e36eb (patch)
tree4cc8f81149e1e7e9b1173b1b85b072ba58084ed7 /dev-util
parente95da21ecbce8a426b0e9c9d41c8a6333003ce52 (diff)
codelite: build fix
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/codelite/codelite-scm.ebuild22
-rw-r--r--dev-util/codelite/files/c++11.patch12
2 files changed, 6 insertions, 28 deletions
diff --git a/dev-util/codelite/codelite-scm.ebuild b/dev-util/codelite/codelite-scm.ebuild
index 9007d62..5bec0be 100644
--- a/dev-util/codelite/codelite-scm.ebuild
+++ b/dev-util/codelite/codelite-scm.ebuild
@@ -15,34 +15,24 @@ EGIT_REPO_URI="git://github.com/eranif/${PN}.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="clang flex mysql pch sftp webview"
+IUSE="clang flex pch sftp webview"
DEPEND="
dev-db/sqlite:*
net-libs/libssh
x11-libs/wxGTK:3.0
- mysql? ( virtual/mysql )
"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/c++11.patch"
-)
-
-#src_prepare() {
-# epatch "${FILESDIR}/codelite_dont_strip.patch"
-#}
src_configure() {
local mycmakeargs=(
- -DENABLE_CLANG="$(usex clang)
- -DWITH_FLEX="$(usex flex)
- -DWITH_MYSQL="$(usex mysql)
- -DWITH_PCH="$(usex pch)
- -DENABLE_SFTP="$(usex sftp)
- -DWITH_WEBVIEW="$(usex webview)
+ -DENABLE_CLANG=$(usex clang)
+ -DWITH_FLEX=$(usex flex)
+ -DWITH_PCH=$(usex pch)
+ -DENABLE_SFTP=$(usex sftp)
+ -DWITH_WEBVIEW=$(usex webview)
)
-
cmake-utils_src_configure
}
diff --git a/dev-util/codelite/files/c++11.patch b/dev-util/codelite/files/c++11.patch
deleted file mode 100644
index d5b1533..0000000
--- a/dev-util/codelite/files/c++11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CodeFormatter/codeformatter.cpp b/CodeFormatter/codeformatter.cpp
-index 56dce2d0b..bb46ab9a6 100644
---- a/CodeFormatter/codeformatter.cpp
-+++ b/CodeFormatter/codeformatter.cpp
-@@ -49,6 +49,7 @@
- #include <wx/filename.h>
- #include <wx/progdlg.h>
- #include <wx/xrc/xmlres.h>
-+#include <algorithm>
-
- static int ID_TOOL_SOURCE_CODE_FORMATTER = ::wxNewId();
-