Revert "sys-devel/make: default CXX to c++ instead of g++, #589894"
authorMichał Górny <mgorny@gentoo.org>
Fri, 14 Apr 2017 16:24:20 +0000 (18:24 +0200)
committerMichał Górny <mgorny@gentoo.org>
Fri, 14 Apr 2017 16:27:58 +0000 (18:27 +0200)
The change was accidentally done to the stable ebuild. Will reland
with ~arch revbump.

Reverts: bace4a893fbf789675d576be2a291aef33db90f5

sys-devel/make/files/make-4.2-default-cxx.patch [deleted file]
sys-devel/make/make-4.2.1.ebuild [moved from sys-devel/make/make-4.2.1-r1.ebuild with 96% similarity]

diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch
deleted file mode 100644 (file)
index 4d59208..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-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
- 
similarity index 96%
rename from sys-devel/make/make-4.2.1-r1.ebuild
rename to sys-devel/make/make-4.2.1.ebuild
index 17448b34b98726b0f2206b84053f077e75545e09..70e90b6bf6235bdd1ee52956d4c5d2819c2f2f32 100644 (file)
@@ -22,7 +22,6 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
-       "${FILESDIR}"/${PN}-4.2-default-cxx.patch
 )
 
 src_prepare() {