gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-admin/elektra: Fix build w/ GCC 5.4.0

Browse Source 
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1656

Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2016-11-06 11:26:27 +01:00
committed by David Seifert
parent 8ba76897c9
commit f0f47a3da9
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app-admin/elektra/elektra-0.8.15.ebuild
View File

@@ -41,7 +41,10 @@ RESTRICT="test"
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch )
PATCHES=(
"${FILESDIR}/${P}"-conditional-glob-tests.patch
"${FILESDIR}/${P}"-gcc-5.4.0.patch
)
src_prepare() {
cmake-utils_src_prepare
@@ -97,13 +100,12 @@ multilib_src_configure() {
fi
mycmakeargs=(
"-DBUILD_PDF=OFF"
"-DBUILD_SHARED=ON"
"-DPLUGINS=${my_plugins}"
"-DTOOLS=${my_tools}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use test ENABLE_TESTING)
@@ -114,7 +116,7 @@ multilib_src_configure() {
multilib_src_install_all() {
einfo remove test_data
rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
}

20
app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch Normal file
View File

@@ -0,0 +1,20 @@
commit 05c925972224afd3fa28f34b9a762364a38f6850
Author: Markus Raab <elektra@markus-raab.org>
Date: Tue May 3 14:25:54 2016 +0200
add vector kdbtimer
fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
index ae4c242..b7f731e 100644
--- a/src/bindings/cpp/include/kdbtimer.hpp
+++ b/src/bindings/cpp/include/kdbtimer.hpp
@@ -13,6 +13,7 @@
#include <sstream>
#include <string>
#include <sys/time.h>
+#include <vector>
#ifdef __GNUC__
#define TIMER_NOINLINE __attribute__ ((noinline))