[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/

[Michał Górny]

commit:     bace4a893fbf789675d576be2a291aef33db90f5
Author:     Lei Zhang <zhanglei.april <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 21:36:35 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 15:34:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bace4a89

sys-devel/make: default CXX to c++ instead of g++, #589894

Closes: https://github.com/gentoo/gentoo/pull/1982
Package-Manager: portage-2.2.28
Reviewed-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-devel/make/files/make-4.2-default-cxx.patch            | 13 +++++++++++++
 sys-devel/make/{make-4.2.1.ebuild => make-4.2.1-r1.ebuild} |  1 +
 2 files changed, 14 insertions(+)

diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch
new file mode 100644
index 00000000000..4d592086a6f
--- /dev/null
+++ b/sys-devel/make/files/make-4.2-default-cxx.patch
@@ -0,0 +1,13 @@
+diff --git a/default.c b/default.c
+index 3d865c7..e8b3ed6 100644
+--- a/default.c
++++ b/default.c
+@@ -530,7 +530,7 @@ static const char *default_variables[] =
+     "OBJC", "gcc",
+ #else
+     "CC", "cc",
+-    "CXX", "g++",
++    "CXX", "c++",
+     "OBJC", "cc",
+ #endif
+ 

diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild
similarity index 96%
rename from sys-devel/make/make-4.2.1.ebuild
rename to sys-devel/make/make-4.2.1-r1.ebuild
index 70e90b6bf62..17448b34b98 100644
--- a/sys-devel/make/make-4.2.1.ebuild
+++ b/sys-devel/make/make-4.2.1-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
+	"${FILESDIR}"/${PN}-4.2-default-cxx.patch
 )
 
 src_prepare() {