diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-11-06 11:26:27 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-11-06 11:29:06 +0100 |
| commit | f0f47a3da9401b69bb7d812bf9e5439a0c40cb49 (patch) | |
| tree | b4238833effcc12084f7ffb5a378df13aee75fc3 /app-admin | |
| parent | sci-libs/opencascade: [QA] Fix multiple violations (diff) | |
| download | gentoo-f0f47a3da9401b69bb7d812bf9e5439a0c40cb49.tar.gz gentoo-f0f47a3da9401b69bb7d812bf9e5439a0c40cb49.tar.bz2 gentoo-f0f47a3da9401b69bb7d812bf9e5439a0c40cb49.zip | |
app-admin/elektra: Fix build w/ GCC 5.4.0
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1656
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/elektra/elektra-0.8.15.ebuild | 14 | ||||
| -rw-r--r-- | app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch | 20 |
2 files changed, 28 insertions, 6 deletions
diff --git a/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild index ea2c8981883c..bdcbd7fed436 100644 --- a/app-admin/elektra/elektra-0.8.15.ebuild +++ b/app-admin/elektra/elektra-0.8.15.ebuild @@ -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" } 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 new file mode 100644 index 000000000000..9bab2a61c9f5 --- /dev/null +++ b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch @@ -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)) |