| 1 |
commit: a9865f4c3b45cd345fe630c20133bc9f1fc0f82d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 4 21:31:54 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 00:34:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9865f4c |
| 7 |
|
| 8 |
app-text/poppler: Unconditionally build with -std=c++11 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/643278 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
app-text/poppler/poppler-0.61.1.ebuild | 10 ++++------ |
| 14 |
app-text/poppler/poppler-0.62.0.ebuild | 10 ++++------ |
| 15 |
app-text/poppler/poppler-9999.ebuild | 8 +++----- |
| 16 |
3 files changed, 11 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/poppler/poppler-0.61.1.ebuild b/app-text/poppler/poppler-0.61.1.ebuild |
| 19 |
index 64b5eec0d53..250e315dbb9 100644 |
| 20 |
--- a/app-text/poppler/poppler-0.61.1.ebuild |
| 21 |
+++ b/app-text/poppler/poppler-0.61.1.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2017 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
|
| 29 |
-inherit cmake-utils toolchain-funcs xdg-utils |
| 30 |
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils |
| 31 |
|
| 32 |
if [[ "${PV}" == "9999" ]] ; then |
| 33 |
inherit git-r3 |
| 34 |
@@ -84,10 +84,8 @@ src_prepare() { |
| 35 |
einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
| 36 |
fi |
| 37 |
|
| 38 |
- if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
| 39 |
- # we need to up the C++ version, bug #622526 |
| 40 |
- export CXX="$(tc-getCXX) -std=c++11" |
| 41 |
- fi |
| 42 |
+ # we need to up the C++ version, bug #622526, #643278 |
| 43 |
+ append-cxxflags -std=c++11 |
| 44 |
} |
| 45 |
|
| 46 |
src_configure() { |
| 47 |
|
| 48 |
diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild |
| 49 |
index b2677478d77..49e0196feea 100644 |
| 50 |
--- a/app-text/poppler/poppler-0.62.0.ebuild |
| 51 |
+++ b/app-text/poppler/poppler-0.62.0.ebuild |
| 52 |
@@ -1,9 +1,9 @@ |
| 53 |
-# Copyright 1999-2017 Gentoo Foundation |
| 54 |
+# Copyright 1999-2018 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
EAPI=6 |
| 58 |
|
| 59 |
-inherit cmake-utils toolchain-funcs xdg-utils |
| 60 |
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils |
| 61 |
|
| 62 |
if [[ "${PV}" == "9999" ]] ; then |
| 63 |
inherit git-r3 |
| 64 |
@@ -79,10 +79,8 @@ src_prepare() { |
| 65 |
einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
| 66 |
fi |
| 67 |
|
| 68 |
- if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
| 69 |
- # we need to up the C++ version, bug #622526 |
| 70 |
- export CXX="$(tc-getCXX) -std=c++11" |
| 71 |
- fi |
| 72 |
+ # we need to up the C++ version, bug #622526, #643278 |
| 73 |
+ append-cxxflags -std=c++11 |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
|
| 78 |
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild |
| 79 |
index f84bcf398fb..99060e661f2 100644 |
| 80 |
--- a/app-text/poppler/poppler-9999.ebuild |
| 81 |
+++ b/app-text/poppler/poppler-9999.ebuild |
| 82 |
@@ -3,7 +3,7 @@ |
| 83 |
|
| 84 |
EAPI=6 |
| 85 |
|
| 86 |
-inherit cmake-utils toolchain-funcs xdg-utils |
| 87 |
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils |
| 88 |
|
| 89 |
if [[ "${PV}" == "9999" ]] ; then |
| 90 |
inherit git-r3 |
| 91 |
@@ -79,10 +79,8 @@ src_prepare() { |
| 92 |
einfo "policy(SET CMP0002 OLD) - workaround can be removed" |
| 93 |
fi |
| 94 |
|
| 95 |
- if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then |
| 96 |
- # we need to up the C++ version, bug #622526 |
| 97 |
- export CXX="$(tc-getCXX) -std=c++11" |
| 98 |
- fi |
| 99 |
+ # we need to up the C++ version, bug #622526, #643278 |
| 100 |
+ append-cxxflags -std=c++11 |
| 101 |
} |
| 102 |
|
| 103 |
src_configure() { |
Archives