| 1 |
commit: f0f47a3da9401b69bb7d812bf9e5439a0c40cb49 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Nov 6 10:26:27 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 10:29:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f47a3d |
| 7 |
|
| 8 |
app-admin/elektra: Fix build w/ GCC 5.4.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/1656 |
| 12 |
|
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/elektra/elektra-0.8.15.ebuild | 14 ++++++++------ |
| 16 |
.../elektra/files/elektra-0.8.15-gcc-5.4.0.patch | 20 ++++++++++++++++++++ |
| 17 |
2 files changed, 28 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild |
| 20 |
index ea2c898..bdcbd7f 100644 |
| 21 |
--- a/app-admin/elektra/elektra-0.8.15.ebuild |
| 22 |
+++ b/app-admin/elektra/elektra-0.8.15.ebuild |
| 23 |
@@ -41,7 +41,10 @@ RESTRICT="test" |
| 24 |
|
| 25 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h ) |
| 26 |
|
| 27 |
-PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch ) |
| 28 |
+PATCHES=( |
| 29 |
+ "${FILESDIR}/${P}"-conditional-glob-tests.patch |
| 30 |
+ "${FILESDIR}/${P}"-gcc-5.4.0.patch |
| 31 |
+) |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
cmake-utils_src_prepare |
| 35 |
@@ -97,13 +100,12 @@ multilib_src_configure() { |
| 36 |
fi |
| 37 |
|
| 38 |
mycmakeargs=( |
| 39 |
+ "-DBUILD_PDF=OFF" |
| 40 |
"-DBUILD_SHARED=ON" |
| 41 |
"-DPLUGINS=${my_plugins}" |
| 42 |
"-DTOOLS=${my_tools}" |
| 43 |
- "-DLATEX_COMPILER=OFF" |
| 44 |
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules" |
| 45 |
- $(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \ |
| 46 |
- || echo -DBUILD_DOCUMENTATION=OFF) |
| 47 |
+ -DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no) |
| 48 |
$(cmake-utils_use static-libs BUILD_STATIC) |
| 49 |
$(cmake-utils_use test BUILD_TESTING) |
| 50 |
$(cmake-utils_use test ENABLE_TESTING) |
| 51 |
@@ -114,7 +116,7 @@ multilib_src_configure() { |
| 52 |
|
| 53 |
multilib_src_install_all() { |
| 54 |
einfo remove test_data |
| 55 |
- rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data" |
| 56 |
+ rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data" |
| 57 |
einfo remove tool_exec |
| 58 |
- rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" |
| 59 |
+ rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec" |
| 60 |
} |
| 61 |
|
| 62 |
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch |
| 63 |
new file mode 100644 |
| 64 |
index 00000000..9bab2a6 |
| 65 |
--- /dev/null |
| 66 |
+++ b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch |
| 67 |
@@ -0,0 +1,20 @@ |
| 68 |
+commit 05c925972224afd3fa28f34b9a762364a38f6850 |
| 69 |
+Author: Markus Raab <elektra@×××××××××××.org> |
| 70 |
+Date: Tue May 3 14:25:54 2016 +0200 |
| 71 |
+ |
| 72 |
+ add vector kdbtimer |
| 73 |
+ |
| 74 |
+ fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console |
| 75 |
+ |
| 76 |
+diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp |
| 77 |
+index ae4c242..b7f731e 100644 |
| 78 |
+--- a/src/bindings/cpp/include/kdbtimer.hpp |
| 79 |
++++ b/src/bindings/cpp/include/kdbtimer.hpp |
| 80 |
+@@ -13,6 +13,7 @@ |
| 81 |
+ #include <sstream> |
| 82 |
+ #include <string> |
| 83 |
+ #include <sys/time.h> |
| 84 |
++#include <vector> |
| 85 |
+ |
| 86 |
+ #ifdef __GNUC__ |
| 87 |
+ #define TIMER_NOINLINE __attribute__ ((noinline)) |
Archives