diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2019-03-09 21:28:26 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2019-03-09 21:28:26 +0000 |
| commit | b116101051ade6aef7cf51a44ba17757c27f09d1 (patch) | |
| tree | dc45d9037d471c11966a2f2e460b3aa66f0dbb7a /sys-apps | |
| parent | 2019-03-09 20:24:21 UTC (diff) | |
| parent | dev-python/sphinx-bootstrap-theme-0.6.5: added ~arm, bug 664178 (diff) | |
| download | gentoo-b116101051ade6aef7cf51a44ba17757c27f09d1.tar.gz gentoo-b116101051ade6aef7cf51a44ba17757c27f09d1.tar.bz2 gentoo-b116101051ade6aef7cf51a44ba17757c27f09d1.zip | |
Merge updates from master
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch | 12 | ||||
| -rw-r--r-- | sys-apps/nix/nix-2.0.4.ebuild | 3 |
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 |