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 3E40F138334 for ; Sat, 9 Mar 2019 21:05:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6476EE0636; Sat, 9 Mar 2019 21:05:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 386E4E0636 for ; Sat, 9 Mar 2019 21:05:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1522B335CB7 for ; Sat, 9 Mar 2019 21:05:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9682054B for ; Sat, 9 Mar 2019 21:05:43 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1552165515.460014c2d82a53a5db86dd2376cbd7045227cc69.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/, sys-apps/nix/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch sys-apps/nix/nix-2.0.4.ebuild X-VCS-Directories: sys-apps/nix/ sys-apps/nix/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 460014c2d82a53a5db86dd2376cbd7045227cc69 X-VCS-Branch: master Date: Sat, 9 Mar 2019 21:05:43 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 955b02b8-ffbc-487c-bc52-2c1c8d570bc8 X-Archives-Hash: 8a24de361f77f4098cd229a7bca7677a commit: 460014c2d82a53a5db86dd2376cbd7045227cc69 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 9 21:04:43 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 9 21:05:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460014c2 sys-apps/nix: tweak for bdwgc-8, bug #679834 Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/679834 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch | 12 ++++++++++++ sys-apps/nix/nix-2.0.4.ebuild | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch new file mode 100644 index 00000000000..ff37f48e360 --- /dev/null +++ b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch @@ -0,0 +1,12 @@ +Add a missing library for gdwgc-8 +--- a/configure.ac ++++ b/configure.ac +@@ -226,6 +226,8 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc], + if test "$gc" = yes; then + PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) + CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS" ++ # a workaround for https://bugs.gentoo.org/679834 ++ BDW_GC_LIBS="$BDW_GC_LIBS -lgccpp" + AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.]) + fi + diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild index 965584cf6f0..a39c4d53087 100644 --- a/sys-apps/nix/nix-2.0.4.ebuild +++ b/sys-apps/nix/nix-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -41,6 +41,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch "${FILESDIR}"/${PN}-2.0-user-path.patch + "${FILESDIR}"/${PN}-2.0.4-bdwgc-8.patch ) DISABLE_AUTOFORMATTING=yes