summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-03-09 21:04:43 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-03-09 21:05:15 +0000
commit460014c2d82a53a5db86dd2376cbd7045227cc69 (patch)
treec094a11b1db651debde4fa4079cb3c31f5cb9d67 /sys-apps
parentmail-client/thunderbird: reorder LVM deps to start from best (diff)
downloadgentoo-460014c2d82a53a5db86dd2376cbd7045227cc69.tar.gz
gentoo-460014c2d82a53a5db86dd2376cbd7045227cc69.tar.bz2
gentoo-460014c2d82a53a5db86dd2376cbd7045227cc69.zip
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 <slyfox@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch12
-rw-r--r--sys-apps/nix/nix-2.0.4.ebuild3
2 files changed, 14 insertions, 1 deletions
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 000000000000..ff37f48e3607
--- /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 965584cf6f01..a39c4d53087c 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