summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2018-01-30 16:33:26 -0800
committerPatrick McLean <chutzpah@gentoo.org>2018-01-30 16:33:26 -0800
commit384a630a875b79a9cef9e9286009fad5d0978296 (patch)
treeb184d27ed8bb1cf75da220f963f3404bc76e7721
parentdev-games/cegui: Drop old (diff)
downloadgentoo-384a630a875b79a9cef9e9286009fad5d0978296.tar.gz
gentoo-384a630a875b79a9cef9e9286009fad5d0978296.tar.bz2
gentoo-384a630a875b79a9cef9e9286009fad5d0978296.zip
app-emulation/ganeti: Add patch to make build system respect HCFLAGS
Package-Manager: Portage-2.3.21, Repoman-2.3.6
-rw-r--r--app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch12
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r6.ebuild1
-rw-r--r--app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild3
3 files changed, 15 insertions, 1 deletions
diff --git a/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
new file mode 100644
index 00000000000..ffab1838bf1
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index a04b95ae3..e26508ad9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -803,6 +803,7 @@ HFLAGS = \
+ -fwarn-tabs \
+ -optP-include -optP$(HASKELL_PACKAGE_VERSIONS_FILE) \
+ -hide-all-packages \
++ $(HCFLAGS) \
+ `cat $(HASKELL_PACKAGE_IDS_FILE)` \
+ $(GHC_BYVERSION_FLAGS)
+ if DEVELOPER_MODE
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index 739b9186e2d..cb14808fba4 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -177,6 +177,7 @@ PATCHES+=(
"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
)
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 5aee625621f..735e13c59f4 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -183,6 +183,7 @@ PATCHES+=(
"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
)
S="${WORKDIR}/${MY_P}"