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@gentoo.org>

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 (file)
index 0000000..4d59208
--- /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 70e90b6bf6235bdd1ee52956d4c5d2819c2f2f32..17448b34b98726b0f2206b84053f077e75545e09 100644 (file)
--- 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() {