Add -fpermissive to linux standard c++ option define in linux.cf

Remove from individual Imakefiles. Also, remove '#if 0' block in linux.cf, and remove empty LinuxMachineDefines. This should be working correctly. If not, let me know.
2025-03-09 15:50:02 +00:00 · 2012-06-18 16:27:25 -06:00 · 2012-06-18 16:27:25 -06:00 · 784c7dff56
commit 784c7dff56
parent 91f7988cf3
21 changed files with 4 additions and 85 deletions
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@ -92,7 +92,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define LdCmd			ld -m elf_i386
 #else
 #define CcCmd			gcc
-#define CplusplusCmd		g++
+#define CplusplusCmd		g++ 
 #define AsCmd			as
 #define LdCmd			ld
 #endif
@ -151,9 +151,9 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #endif
 #endif

-#define LinuxMachineDefines
+XCOMM This is needed for CDE currently
+#define CplusplusStandardDefines StandardDefines -fpermissive

-#if 0
 #ifdef i386Architecture
 #define OptimizedCDebugFlags	DefaultGcc2i386Opt
 #define LinuxMachineDefines	-D__i386__
@ -179,7 +179,6 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define ServerOSDefines         XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
 #endif /* Mc68020Architecture */
-#endif /* 0 */

 #define StandardDefines		-Dlinux LinuxMachineDefines LinuxSourceDefines

--- a/cde/lib/DtSvc/DtCodelibs/Imakefile
+++ b/cde/lib/DtSvc/DtCodelibs/Imakefile
@ -31,10 +31,6 @@ INCLUDES = -I. -I../include
 CXXEXTRA_DEFINES = -qlanglvl=compat
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS =	buf.C		filegen.C	mbschr.C \
 	pathcollapse.C 	shellscan.C	strend.C \
 	strhash.C 	stringio.C 	strtokx.C \
--- a/cde/lib/tt/bin/dbck/Imakefile
+++ b/cde/lib/tt/bin/dbck/Imakefile
@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS =  binkey.C        binkey_utils.C  common.C \
        options.C       options_tt.C    prop.C \
        prop_utils.C    spec.C          spec_repair.C \
--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
+++ b/cde/lib/tt/bin/tt_type_comp/Imakefile
@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS =	mp_type_comp.C        mp_types_table.C \
 	frozen.mp_types_lex.C frozen.mp_types_gram.C

--- a/cde/lib/tt/bin/ttdbserverd/Imakefile
+++ b/cde/lib/tt/bin/ttdbserverd/Imakefile
@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = \
        db_server_functions.C \
        db_server_svc.C \
--- a/cde/lib/tt/bin/ttsession/Imakefile
+++ b/cde/lib/tt/bin/ttsession/Imakefile
@ -19,10 +19,6 @@ SYS_LIBRARIES   =
 EXTRA_LIBRARIES = TtClientExtraLibs
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = mp_server.C

 OBJS = mp_server.o
--- a/cde/lib/tt/lib/api/c/Imakefile
+++ b/cde/lib/tt/lib/api/c/Imakefile
@ -21,10 +21,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES = 
 INCLUDES = -I../../../lib

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE! 
 *** Every time a .o is added below it needs to be added to
 *** the lib/tt/lib Imakefile in OBJS and SHARED_OBJS
--- a/cde/lib/tt/lib/db/Imakefile
+++ b/cde/lib/tt/lib/db/Imakefile
@ -19,10 +19,6 @@ DEFINES =
 INCLUDES = -I../../lib
 ISAM_INCLUDES = -I../../mini_isam 

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
 *** Every time a .o is added below it needs to be added to
 *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS
--- a/cde/lib/tt/lib/mp/Imakefile
+++ b/cde/lib/tt/lib/mp/Imakefile
@ -24,10 +24,6 @@ ISAM_INCLUDES = -I../../mini_isam
 CXXEXTRA_DEFINES = -DCOMPAT_43
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
 *** Every time a .o is added below it needs to be added to
 *** the lib/tt/lib Imakefile in MP_OBJS and SHARED_MP_OBJS
--- a/cde/lib/tt/lib/tttk/Imakefile
+++ b/cde/lib/tt/lib/tttk/Imakefile
@ -21,10 +21,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES =
 INCLUDES = -I../../lib

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
 *** Every time a .o is added below it needs to be added to
 *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS
--- a/cde/lib/tt/lib/util/Imakefile
+++ b/cde/lib/tt/lib/util/Imakefile
@ -23,10 +23,6 @@ INCLUDES = -I../../lib
 CXXEXTRA_DEFINES = -D_ILS_MACROS
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /*** NOTE!
 *** Every time a .o is added below it needs to be added to
 *** the lib/tt/lib Imakefile in UTIL_OBJS and SHARED_UTIL_OBJS
--- a/cde/lib/tt/slib/Imakefile
+++ b/cde/lib/tt/slib/Imakefile
@ -17,10 +17,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 DEFINES = 
 INCLUDES = -I. -I../lib

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS = \
 mp_ce_attrs.C		mp_observer.C		   mp_observer_utils.C  \
 mp_otype.C		mp_otype_utils.C	   mp_ptype.C		\
--- a/cde/programs/dtmail/MotifApp/Imakefile
+++ b/cde/programs/dtmail/MotifApp/Imakefile
@ -34,11 +34,6 @@ EXTRA_C++OPTIONS =     -xF +p +w $(SPRO_V3_OPTIONS)

 #endif /* SunArchitecture */

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
-
 HEADERS = 

 SRCS = \
--- a/cde/programs/dtmail/dtmail/Imakefile
+++ b/cde/programs/dtmail/dtmail/Imakefile
@ -16,10 +16,6 @@ DEFINES = -DRELEASE_NOTES -DDTMAIL_TOOLTALK -DDTEDITOR DtMailDefines
 DEPLIBS = ../MotifApp/libMotifApp.a ../libDtMail/libDtMail.a DepDtClientLibs
 LOCAL_LIBRARIES = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a DtClientLibs

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 /* Sun needs the widechar library */
 #ifdef SunArchitecture
 SYS_LIBRARIES =	$(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lw -lm
--- a/cde/programs/dtmail/dtmailpr/Imakefile
+++ b/cde/programs/dtmail/dtmailpr/Imakefile
@ -40,10 +40,6 @@ MT_LIBS		=	-i $(C++_LIB)  -lm -lw -lc
 SYS_LIBRARIES	=	-lintl -lnsl $(MT_LIBS) -lC
 #endif /* SunArchitecture */

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
- 
 SRCS = main.C message.C mailbox.C utils.C
 OBJS = main.o message.o mailbox.o utils.o

--- a/cde/programs/dtmail/libDtMail/Common/Imakefile
+++ b/cde/programs/dtmail/libDtMail/Common/Imakefile
@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)

 INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
 #else
--- a/cde/programs/dtmail/libDtMail/RFC/Imakefile
+++ b/cde/programs/dtmail/libDtMail/RFC/Imakefile
@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)

 INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 #if HasVFork
 VFORK_DEFINES = -DHAS_VFORK
 #else
--- a/cde/programs/dtprintinfo/Imakefile
+++ b/cde/programs/dtprintinfo/Imakefile
@ -23,10 +23,6 @@ all:: $(DTPRINTINFO_GEN)
 .NO_PARALLEL:
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \
 	-I./objects -I./objects/PrintObj

--- a/cde/programs/dtprintinfo/UI/Imakefile
+++ b/cde/programs/dtprintinfo/UI/Imakefile
@ -16,11 +16,6 @@ INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../ob
 DEFINES = -DHAS_EXCEPTIONS
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
-
 SRCS = 	DtActions.C	DtApp.C 	DtDetailsLabel.C \
 	DtFindD.C	DtFindSet.C 	DtMainW.C \
 	DtPrinterIcon.C DtProps.C 	DtPrtJobIcon.C \
--- a/cde/programs/dtsearchpath/libCliSrv/Imakefile
+++ b/cde/programs/dtsearchpath/libCliSrv/Imakefile
@ -22,10 +22,6 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS
 EXTRA_DEFINES = -DIOSTREAMSWORKS
 #endif

-#if defined(LinuxArchitecture)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
-
 SRCS =	DirIterator.C 	Environ.C 	TTFile.C \
 	UnixEnv.C	cstring.C

--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@ -77,7 +77,7 @@ STLIBCENV =
 M4 = /bin/m4
 #endif

-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture(

 /*
 * put cpp directives here rather than in CXXDEFINES because
@ -95,8 +95,6 @@ CXXTEMPLATEFLAGS =

 M4 = /usr/bin/m4

-CXXEXTRA_DEFINES = -fpermissive
-
 #endif

 #if defined(RsArchitecture)