| 1 |
commit: 384a630a875b79a9cef9e9286009fad5d0978296 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 31 00:33:26 2018 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 31 00:33:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384a630a |
| 7 |
|
| 8 |
app-emulation/ganeti: Add patch to make build system respect HCFLAGS |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.21, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch | 12 ++++++++++++ |
| 13 |
app-emulation/ganeti/ganeti-2.15.2-r6.ebuild | 1 + |
| 14 |
app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 3 ++- |
| 15 |
3 files changed, 15 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..ffab1838bf1 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch |
| 22 |
@@ -0,0 +1,12 @@ |
| 23 |
+diff --git a/Makefile.am b/Makefile.am |
| 24 |
+index a04b95ae3..e26508ad9 100644 |
| 25 |
+--- a/Makefile.am |
| 26 |
++++ b/Makefile.am |
| 27 |
+@@ -803,6 +803,7 @@ HFLAGS = \ |
| 28 |
+ -fwarn-tabs \ |
| 29 |
+ -optP-include -optP$(HASKELL_PACKAGE_VERSIONS_FILE) \ |
| 30 |
+ -hide-all-packages \ |
| 31 |
++ $(HCFLAGS) \ |
| 32 |
+ `cat $(HASKELL_PACKAGE_IDS_FILE)` \ |
| 33 |
+ $(GHC_BYVERSION_FLAGS) |
| 34 |
+ if DEVELOPER_MODE |
| 35 |
|
| 36 |
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild |
| 37 |
index 739b9186e2d..cb14808fba4 100644 |
| 38 |
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild |
| 39 |
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild |
| 40 |
@@ -177,6 +177,7 @@ PATCHES+=( |
| 41 |
"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" |
| 42 |
"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" |
| 43 |
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" |
| 44 |
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" |
| 45 |
) |
| 46 |
|
| 47 |
S="${WORKDIR}/${MY_P}" |
| 48 |
|
| 49 |
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild |
| 50 |
index 5aee625621f..735e13c59f4 100644 |
| 51 |
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild |
| 52 |
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2017 Gentoo Foundation |
| 55 |
+# Copyright 1999-2018 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
@@ -183,6 +183,7 @@ PATCHES+=( |
| 60 |
"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch" |
| 61 |
"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" |
| 62 |
"${FILESDIR}/fix_ftbfs_with_sphinx_1.4" |
| 63 |
+ "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" |
| 64 |
) |
| 65 |
|
| 66 |
S="${WORKDIR}/${MY_P}" |
Archives