From 784c7dff563ba8c9af3e9b297ec1589d6b31c99b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 18 Jun 2012 16:27:25 -0600 Subject: [PATCH] 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. --- cde/config/cf/linux.cf | 7 +++---- cde/lib/DtSvc/DtCodelibs/Imakefile | 4 ---- cde/lib/tt/bin/dbck/Imakefile | 4 ---- cde/lib/tt/bin/tt_type_comp/Imakefile | 4 ---- cde/lib/tt/bin/ttdbserverd/Imakefile | 4 ---- cde/lib/tt/bin/ttsession/Imakefile | 4 ---- cde/lib/tt/lib/api/c/Imakefile | 4 ---- cde/lib/tt/lib/db/Imakefile | 4 ---- cde/lib/tt/lib/mp/Imakefile | 4 ---- cde/lib/tt/lib/tttk/Imakefile | 4 ---- cde/lib/tt/lib/util/Imakefile | 4 ---- cde/lib/tt/slib/Imakefile | 4 ---- cde/programs/dtmail/MotifApp/Imakefile | 5 ----- cde/programs/dtmail/dtmail/Imakefile | 4 ---- cde/programs/dtmail/dtmailpr/Imakefile | 4 ---- cde/programs/dtmail/libDtMail/Common/Imakefile | 4 ---- cde/programs/dtmail/libDtMail/RFC/Imakefile | 4 ---- cde/programs/dtprintinfo/Imakefile | 4 ---- cde/programs/dtprintinfo/UI/Imakefile | 5 ----- cde/programs/dtsearchpath/libCliSrv/Imakefile | 4 ---- cde/programs/nsgmls/Imakefile | 4 +--- 21 files changed, 4 insertions(+), 85 deletions(-) diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf index fe0ad6b6..f6a64455 100644 --- 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 diff --git a/cde/lib/DtSvc/DtCodelibs/Imakefile b/cde/lib/DtSvc/DtCodelibs/Imakefile index e71e7058..fb6ae3d5 100644 --- 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 \ diff --git a/cde/lib/tt/bin/dbck/Imakefile b/cde/lib/tt/bin/dbck/Imakefile index 4e40451d..369be760 100644 --- 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 \ diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile index ac61d619..82ce6b83 100644 --- 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 diff --git a/cde/lib/tt/bin/ttdbserverd/Imakefile b/cde/lib/tt/bin/ttdbserverd/Imakefile index e11b8f0a..8a538c6f 100644 --- 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 \ diff --git a/cde/lib/tt/bin/ttsession/Imakefile b/cde/lib/tt/bin/ttsession/Imakefile index 13d4ed9a..f7b74251 100644 --- 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 diff --git a/cde/lib/tt/lib/api/c/Imakefile b/cde/lib/tt/lib/api/c/Imakefile index c62f8025..76b821eb 100644 --- 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 diff --git a/cde/lib/tt/lib/db/Imakefile b/cde/lib/tt/lib/db/Imakefile index 279e1670..8f82a8bc 100644 --- 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 diff --git a/cde/lib/tt/lib/mp/Imakefile b/cde/lib/tt/lib/mp/Imakefile index 5e126391..ddce7180 100644 --- 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 diff --git a/cde/lib/tt/lib/tttk/Imakefile b/cde/lib/tt/lib/tttk/Imakefile index f5174e44..4271fa8e 100644 --- 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 diff --git a/cde/lib/tt/lib/util/Imakefile b/cde/lib/tt/lib/util/Imakefile index dfcc740b..c6d68565 100644 --- 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 diff --git a/cde/lib/tt/slib/Imakefile b/cde/lib/tt/slib/Imakefile index cbbc660c..86c180f7 100644 --- 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 \ diff --git a/cde/programs/dtmail/MotifApp/Imakefile b/cde/programs/dtmail/MotifApp/Imakefile index 5c2c296b..cdf849e7 100644 --- 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 = \ diff --git a/cde/programs/dtmail/dtmail/Imakefile b/cde/programs/dtmail/dtmail/Imakefile index 5eabe87b..210abd55 100644 --- 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 diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile index 7765d65d..a980e4fd 100644 --- 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 diff --git a/cde/programs/dtmail/libDtMail/Common/Imakefile b/cde/programs/dtmail/libDtMail/Common/Imakefile index 59881aac..f5b30832 100644 --- 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 diff --git a/cde/programs/dtmail/libDtMail/RFC/Imakefile b/cde/programs/dtmail/libDtMail/RFC/Imakefile index c4ac453d..2b0ca195 100644 --- 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 diff --git a/cde/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile index f948d316..ed42f6e5 100644 --- 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 diff --git a/cde/programs/dtprintinfo/UI/Imakefile b/cde/programs/dtprintinfo/UI/Imakefile index f92fd52b..44fc8028 100644 --- 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 \ diff --git a/cde/programs/dtsearchpath/libCliSrv/Imakefile b/cde/programs/dtsearchpath/libCliSrv/Imakefile index 637c0c57..83cd42f1 100644 --- 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 diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile index 166bb666..e44e352b 100644 --- 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) -- 2.25.1