summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-10 03:22:08 +0100
committerMamut Ghiunhan <V3n3RiX@users.noreply.github.com>2015-06-10 03:22:08 +0100
commit363c2e2e480fb821dc6c063205610b5cad3b362a (patch)
tree9341c6fb282713553fb28f72c0cb27a7f52f2f9e
parent7768184ca401c1b8b71c0f4f1139cf937cf85ace (diff)
parent1757d15549a81cf104ba6f4b5c1bbabd09edf9f0 (diff)
Merge pull request #35 from V3n3RiX/master
force enable python in our calamares build
-rw-r--r--app-admin/calamares/calamares-999.ebuild7
-rw-r--r--app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch (renamed from app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch)0
2 files changed, 5 insertions, 2 deletions
diff --git a/app-admin/calamares/calamares-999.ebuild b/app-admin/calamares/calamares-999.ebuild
index 1160599d..1da39160 100644
--- a/app-admin/calamares/calamares-999.ebuild
+++ b/app-admin/calamares/calamares-999.ebuild
@@ -74,8 +74,11 @@ RDEPEND=">=dev-qt/designer-5.4.0:5
virtual/udev[systemd]"
src_prepare() {
- # cmake cannot find python3 boost libs on gentoo, but with a little help it will (fixes landed upstream, disable this for now)
- # epatch "${FILESDIR}/cmake-find-gentoo-python3-boost-libs.patch"
+ # by default, python support is optional and calamares builds fine if is not found
+ # on gentoo finding python && boost libs is sometimes problematic, and we really really
+ # want python support in our package
+ # this patch helps calamares to find python && boost libs and force-enables python
+ epatch "${FILESDIR}/${PN}-find-gentoo-python3-boost-libs.patch"
# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
# Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild)
diff --git a/app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch b/app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch
index 1756b02f..1756b02f 100644
--- a/app-admin/calamares/files/cmake-find-gentoo-python3-boost-libs.patch
+++ b/app-admin/calamares/files/calamares-find-gentoo-python3-boost-libs.patch