diff options
| author |   Peter Levine <plevine457@gmail.com> | 2017-10-10 20:29:23 -0400 |
|---|---|---|
| committer |   Ultrabug <ultrabug@gentoo.org> | 2017-10-13 10:09:14 +0200 |
| commit | f68353d2a5e5417b3d39f659ebd9aaee6190da63 (patch) | |
| tree | 9f54ec2b5f4525b8b7ed379457de6887c398d75f /dev-db/rethinkdb | |
| parent | dev-ml/lwt_ssl: bump to 1.1.1 (diff) | |
| download | gentoo-f68353d2a5e5417b3d39f659ebd9aaee6190da63.tar.gz gentoo-f68353d2a5e5417b3d39f659ebd9aaee6190da63.tar.bz2 gentoo-f68353d2a5e5417b3d39f659ebd9aaee6190da63.zip | |
dev-db/rethinkdb: Fix building with GCC-6
Bug: https://bugs.gentoo.org/594220
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5911
Diffstat (limited to 'dev-db/rethinkdb')
| -rw-r--r-- | dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch | 37 | ||||
| -rw-r--r-- | dev-db/rethinkdb/rethinkdb-2.3.5.ebuild | 6 |
2 files changed, 42 insertions, 1 deletions
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch new file mode 100644 index 000000000000..e3d5eac88a45 --- /dev/null +++ b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch @@ -0,0 +1,37 @@ +Bug: https://bugs.gentoo.org/594220 +Commit: https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c + +From 871bd3705a1f29c4ab07a096d562a4b06231a97c Mon Sep 17 00:00:00 2001 +From: Etienne Laurin <etienne@atnnn.com> +Date: Wed, 16 Nov 2016 04:17:41 +0000 +Subject: [PATCH] Workaround for building V8 with GCC 6.2 + +--- + mk/support/pkg/v8.sh | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh +index dc339ad0715..97f4d336c03 100644 +--- a/mk/support/pkg/v8.sh ++++ b/mk/support/pkg/v8.sh +@@ -44,8 +44,10 @@ pkg_install () { + arm*) arch=arm; arch_gypflags=$raspberry_pi_gypflags ;; + *) arch=native ;; + esac ++ + mode=release +- pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1 ++ pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 ++ + for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do + name=`basename $lib` + cp $lib "$install_dir/lib/${name/.$arch/}" +@@ -56,7 +58,7 @@ pkg_install () { + pkg_link-flags () { + # These are the necessary libraries recommended by the docs: + # https://developers.google.com/v8/get_started#hello +- for lib in libv8_{base,libbase,snapshot,libplatform}; do ++ for lib in libv8_{base,nosnapshot,libbase,libplatform}; do + echo "$install_dir/lib/$lib.a" + done + for lib in libicu{i18n,uc,data}; do diff --git a/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild index 7dafd2bc1039..e9ee79bfdde0 100644 --- a/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild +++ b/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild @@ -32,8 +32,12 @@ pkg_setup() { enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb } +PATCHES=( + "${FILESDIR}"/${PN}-2.3.5-gcc6.patch +) + src_prepare() { - eapply_user + default # don't use predefined configuration rm configure.default |