From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99BBE1395E2 for ; Sun, 6 Nov 2016 10:29:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41D05E08E1; Sun, 6 Nov 2016 10:29:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C47FE08E9 for ; Sun, 6 Nov 2016 10:29:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 828ED34168A for ; Sun, 6 Nov 2016 10:29:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0DF6249D for ; Sun, 6 Nov 2016 10:29:40 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1478428146.f0f47a3da9401b69bb7d812bf9e5439a0c40cb49.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, app-admin/elektra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/elektra/elektra-0.8.15.ebuild app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch X-VCS-Directories: app-admin/elektra/files/ app-admin/elektra/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f0f47a3da9401b69bb7d812bf9e5439a0c40cb49 X-VCS-Branch: master Date: Sun, 6 Nov 2016 10:29:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 67372777-c7ef-4cc1-a288-51c0fa4d5352 X-Archives-Hash: 48b3912188d1a436dcb02130bebfcfe0 commit: f0f47a3da9401b69bb7d812bf9e5439a0c40cb49 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Nov 6 10:26:27 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Nov 6 10:29:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f47a3d 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 gentoo.org> app-admin/elektra/elektra-0.8.15.ebuild | 14 ++++++++------ .../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 ea2c898..bdcbd7f 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 00000000..9bab2a6 --- /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 +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 + #include + #include ++#include + + #ifdef __GNUC__ + #define TIMER_NOINLINE __attribute__ ((noinline))