This patch makes minor corrections and cleanup to sun.cf
As part of this is reverting some text (Solaris 5.x to Solaris 2.x),
some explanation of Solaris versioning is probably in order....
Kernel OS Marketing
--------- --------- ---------
SunOS 5.11 == Solaris 2.11 == Solaris 11
So it's not Solaris 5.x, but SunOS 5.x and Solaris 2.x. The original
text was correct here.
-mrt
>From a281af9426eee4be5a41406ccc6500cf3ebad605 Mon Sep 17 00:00:00 2001
From: "Matthew R. Trower" <d...@blackshard.net>
Date: Mon, 11 Jun 2018 23:10:39 -0500
Subject: [PATCH] Minor corrections and cleanup to sun.cf
---
cde/config/cf/sun.cf | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 3be9684d..4ce766b7 100644
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -29,8 +29,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* configuration varibles used here.
*
* If you don't tell us which C compiler you have, we assume you have
- * the Gcc C compiler under Solaris 5.x.
- * under SunOS 4.1.x
+ * the Gcc C compiler under Solaris 2.x.
*
* === C++ Compiler Setup ==========================================
*
@@ -43,8 +42,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
* In any case, you may also need to set CplusplusDependIncludes.
*
* If you say you have the SunPro C++ compiler, we assume you have
- * version 5.0.x of the compiler. If you have version 4.0.x instead,
- * define CplusplusCompilerMajorVersion as 4 in host.def.
+ * version 5.0.x of the compiler. If you have an earlier version
+ * instead, define CplusplusCompilerMajorVersion in host.def.
*
*/
@@ -182,8 +181,10 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
# define OptimizedCplusplusDebugFlags -O2 -erroff=attrskipunsup
#endif
#ifndef CplusplusDependIncludes
-#if CplusplusCompilerMajorVersion > 3
+#if CplusplusCompilerMajorVersion > 4
# define CplusplusDependIncludes -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd -I/opt/solarisstudio/prod/include/CC/std
+#elif CplusplusCompilerMajorVersion > 3
+# define CplusplusDependIncludes -I/opt/SUNWspro/SC4.0/include/CC
#elif CplusplusCompilerMajorVersion > 2
# define CplusplusDependIncludes -I/opt/SUNWspro/SC3.0/include/CC
#else
--
2.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
