summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZoltan Puskas <zoltan@sinustrom.info>2017-06-25 16:30:26 -0700
committerMichał Górny <mgorny@gentoo.org>2017-07-11 22:01:17 +0200
commit80850af0ef41f77d8b11f1fca6adf56559fdb258 (patch)
tree021ee01d97f1d5483fdfec09a8294f267636a843 /sci-electronics
parentnet-im/slack-bin: bump to 2.6.3 (bug #619592) (diff)
downloadgentoo-80850af0ef41f77d8b11f1fca6adf56559fdb258.tar.gz
gentoo-80850af0ef41f77d8b11f1fca6adf56559fdb258.tar.bz2
gentoo-80850af0ef41f77d8b11f1fca6adf56559fdb258.zip
sci-electronics/kicad: Fix configure issue w/ USE='-python', #620130
Make sure only to set python library and executable paths, when python scripting is requested Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/kicad/kicad-4.0.5-r1.ebuild10
-rw-r--r--sci-electronics/kicad/kicad-4.0.6.ebuild10
2 files changed, 12 insertions, 8 deletions
diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
index 3e7cb453e50..85d80609cb0 100644
--- a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
@@ -125,10 +125,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DPYTHON_DEST="$(python_get_sitedir)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
-DKICAD_DOCS="/usr/share/doc/${PF}"
-DKICAD_HELP="/usr/share/doc/${PF}/help"
-DwxUSE_UNICODE=ON
@@ -140,6 +136,12 @@ src_configure() {
-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-DCMAKE_CXX_FLAGS="-std=c++11"
)
+ use python && mycmakeargs+=(
+ -DPYTHON_DEST="$(python_get_sitedir)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ )
if use debug; then
append-cxxflags "-DDEBUG"
append-cflags "-DDEBUG"
diff --git a/sci-electronics/kicad/kicad-4.0.6.ebuild b/sci-electronics/kicad/kicad-4.0.6.ebuild
index 3e7cb453e50..85d80609cb0 100644
--- a/sci-electronics/kicad/kicad-4.0.6.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.6.ebuild
@@ -125,10 +125,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DPYTHON_DEST="$(python_get_sitedir)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
-DKICAD_DOCS="/usr/share/doc/${PF}"
-DKICAD_HELP="/usr/share/doc/${PF}/help"
-DwxUSE_UNICODE=ON
@@ -140,6 +136,12 @@ src_configure() {
-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-DCMAKE_CXX_FLAGS="-std=c++11"
)
+ use python && mycmakeargs+=(
+ -DPYTHON_DEST="$(python_get_sitedir)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ )
if use debug; then
append-cxxflags "-DDEBUG"
append-cflags "-DDEBUG"