external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Jon Trulson 2012-06-18 16:27:25 -06:00
parent 91f7988cf3
commit 784c7dff56
21 changed files with 4 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/config/cf/linux.cf
View file

@ -92,7 +92,7 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define LdCmd ld -m elf_i386 #define LdCmd ld -m elf_i386
#else #else
#define CcCmd gcc #define CcCmd gcc
#define CplusplusCmd g++ #define CplusplusCmd g++
#define AsCmd as #define AsCmd as
#define LdCmd ld #define LdCmd ld
#endif #endif
@ -151,9 +151,9 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#endif #endif
#endif #endif
#define LinuxMachineDefines XCOMM This is needed for CDE currently
#define CplusplusStandardDefines StandardDefines -fpermissive
#if 0
#ifdef i386Architecture #ifdef i386Architecture
#define OptimizedCDebugFlags DefaultGcc2i386Opt #define OptimizedCDebugFlags DefaultGcc2i386Opt
#define LinuxMachineDefines -D__i386__ #define LinuxMachineDefines -D__i386__
@ -179,7 +179,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
#endif /* Mc68020Architecture */ #endif /* Mc68020Architecture */
#endif /* 0 */
#define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines #define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines

4
cde/lib/DtSvc/DtCodelibs/Imakefile
View file

@ -31,10 +31,6 @@ INCLUDES = -I. -I../include
CXXEXTRA_DEFINES = -qlanglvl=compat CXXEXTRA_DEFINES = -qlanglvl=compat
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = buf.C filegen.C mbschr.C \ SRCS = buf.C filegen.C mbschr.C \
pathcollapse.C shellscan.C strend.C \ pathcollapse.C shellscan.C strend.C \
strhash.C stringio.C strtokx.C \ strhash.C stringio.C strtokx.C \

4
cde/lib/tt/bin/dbck/Imakefile
View file

@ -19,10 +19,6 @@ SYS_LIBRARIES =
EXTRA_LIBRARIES = TtClientExtraLibs EXTRA_LIBRARIES = TtClientExtraLibs
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = binkey.C binkey_utils.C common.C \ SRCS = binkey.C binkey_utils.C common.C \
options.C options_tt.C prop.C \ options.C options_tt.C prop.C \
prop_utils.C spec.C spec_repair.C \ prop_utils.C spec.C spec_repair.C \

4
cde/lib/tt/bin/tt_type_comp/Imakefile
View file

@ -19,10 +19,6 @@ SYS_LIBRARIES =
EXTRA_LIBRARIES = TtClientExtraLibs EXTRA_LIBRARIES = TtClientExtraLibs
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = mp_type_comp.C mp_types_table.C \ SRCS = mp_type_comp.C mp_types_table.C \
frozen.mp_types_lex.C frozen.mp_types_gram.C frozen.mp_types_lex.C frozen.mp_types_gram.C

4
cde/lib/tt/bin/ttdbserverd/Imakefile
View file

@ -19,10 +19,6 @@ SYS_LIBRARIES =
EXTRA_LIBRARIES = TtClientExtraLibs EXTRA_LIBRARIES = TtClientExtraLibs
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = \ SRCS = \
db_server_functions.C \ db_server_functions.C \
db_server_svc.C \ db_server_svc.C \

4
cde/lib/tt/bin/ttsession/Imakefile
View file

@ -19,10 +19,6 @@ SYS_LIBRARIES =
EXTRA_LIBRARIES = TtClientExtraLibs EXTRA_LIBRARIES = TtClientExtraLibs
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = mp_server.C SRCS = mp_server.C
OBJS = mp_server.o OBJS = mp_server.o

4
cde/lib/tt/lib/api/c/Imakefile
View file

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

4
cde/lib/tt/lib/db/Imakefile
View file

@ -19,10 +19,6 @@ DEFINES =
INCLUDES = -I../../lib INCLUDES = -I../../lib
ISAM_INCLUDES = -I../../mini_isam ISAM_INCLUDES = -I../../mini_isam
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** 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 *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS

4
cde/lib/tt/lib/mp/Imakefile
View file

@ -24,10 +24,6 @@ ISAM_INCLUDES = -I../../mini_isam
CXXEXTRA_DEFINES = -DCOMPAT_43 CXXEXTRA_DEFINES = -DCOMPAT_43
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** 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 *** the lib/tt/lib Imakefile in MP_OBJS and SHARED_MP_OBJS

4
cde/lib/tt/lib/tttk/Imakefile
View file

@ -21,10 +21,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEFINES = DEFINES =
INCLUDES = -I../../lib INCLUDES = -I../../lib
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** 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 *** the lib/tt/lib Imakefile in DB_OBJS and SHARED_DB_OBJS

4
cde/lib/tt/lib/util/Imakefile
View file

@ -23,10 +23,6 @@ INCLUDES = -I../../lib
CXXEXTRA_DEFINES = -D_ILS_MACROS CXXEXTRA_DEFINES = -D_ILS_MACROS
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/*** NOTE! /*** NOTE!
*** Every time a .o is added below it needs to be added to *** 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 *** the lib/tt/lib Imakefile in UTIL_OBJS and SHARED_UTIL_OBJS

4
cde/lib/tt/slib/Imakefile
View file

@ -17,10 +17,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
DEFINES = DEFINES =
INCLUDES = -I. -I../lib INCLUDES = -I. -I../lib
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = \ SRCS = \
mp_ce_attrs.C mp_observer.C mp_observer_utils.C \ mp_ce_attrs.C mp_observer.C mp_observer_utils.C \
mp_otype.C mp_otype_utils.C mp_ptype.C \ mp_otype.C mp_otype_utils.C mp_ptype.C \

5
cde/programs/dtmail/MotifApp/Imakefile
View file

@ -34,11 +34,6 @@ EXTRA_C++OPTIONS = -xF +p +w $(SPRO_V3_OPTIONS)
#endif /* SunArchitecture */ #endif /* SunArchitecture */
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
HEADERS = HEADERS =
SRCS = \ SRCS = \

4
cde/programs/dtmail/dtmail/Imakefile
View file

@ -16,10 +16,6 @@ DEFINES = -DRELEASE_NOTES -DDTMAIL_TOOLTALK -DDTEDITOR DtMailDefines
DEPLIBS = ../MotifApp/libMotifApp.a ../libDtMail/libDtMail.a DepDtClientLibs DEPLIBS = ../MotifApp/libMotifApp.a ../libDtMail/libDtMail.a DepDtClientLibs
LOCAL_LIBRARIES = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a DtClientLibs LOCAL_LIBRARIES = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a DtClientLibs
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
/* Sun needs the widechar library */ /* Sun needs the widechar library */
#ifdef SunArchitecture #ifdef SunArchitecture
SYS_LIBRARIES = $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lw -lm SYS_LIBRARIES = $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lw -lm

4
cde/programs/dtmail/dtmailpr/Imakefile
View file

@ -40,10 +40,6 @@ MT_LIBS = -i $(C++_LIB) -lm -lw -lc
SYS_LIBRARIES = -lintl -lnsl $(MT_LIBS) -lC SYS_LIBRARIES = -lintl -lnsl $(MT_LIBS) -lC
#endif /* SunArchitecture */ #endif /* SunArchitecture */
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = main.C message.C mailbox.C utils.C SRCS = main.C message.C mailbox.C utils.C
OBJS = main.o message.o mailbox.o utils.o OBJS = main.o message.o mailbox.o utils.o

4
cde/programs/dtmail/libDtMail/Common/Imakefile
View file

@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC)
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
#if HasVFork #if HasVFork
VFORK_DEFINES = -DHAS_VFORK VFORK_DEFINES = -DHAS_VFORK
#else #else

4
cde/programs/dtmail/libDtMail/RFC/Imakefile
View file

@ -14,10 +14,6 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC)
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
#if HasVFork #if HasVFork
VFORK_DEFINES = -DHAS_VFORK VFORK_DEFINES = -DHAS_VFORK
#else #else

4
cde/programs/dtprintinfo/Imakefile
View file

@ -23,10 +23,6 @@ all:: $(DTPRINTINFO_GEN)
.NO_PARALLEL: .NO_PARALLEL:
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \ INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \
-I./objects -I./objects/PrintObj -I./objects -I./objects/PrintObj

5
cde/programs/dtprintinfo/UI/Imakefile
View file

@ -16,11 +16,6 @@ INCLUDES = -I. -I.. -I../libUI -I../libUI/MotifUI -I../objects -I../util -I../ob
DEFINES = -DHAS_EXCEPTIONS DEFINES = -DHAS_EXCEPTIONS
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = DtActions.C DtApp.C DtDetailsLabel.C \ SRCS = DtActions.C DtApp.C DtDetailsLabel.C \
DtFindD.C DtFindSet.C DtMainW.C \ DtFindD.C DtFindSet.C DtMainW.C \
DtPrinterIcon.C DtProps.C DtPrtJobIcon.C \ DtPrinterIcon.C DtProps.C DtPrtJobIcon.C \

4
cde/programs/dtsearchpath/libCliSrv/Imakefile
View file

@ -22,10 +22,6 @@ EXTRA_DEFINES = -DIOSTREAMSWORKS
EXTRA_DEFINES = -DIOSTREAMSWORKS EXTRA_DEFINES = -DIOSTREAMSWORKS
#endif #endif
#if defined(LinuxArchitecture)
CXXEXTRA_DEFINES = -fpermissive
#endif
SRCS = DirIterator.C Environ.C TTFile.C \ SRCS = DirIterator.C Environ.C TTFile.C \
UnixEnv.C cstring.C UnixEnv.C cstring.C

4
cde/programs/nsgmls/Imakefile
View file

@ -77,7 +77,7 @@ STLIBCENV =
M4 = /bin/m4 M4 = /bin/m4
#endif #endif
#ifdef LinuxArchitecture #if defined(LinuxArchitecture(
/* /*
* put cpp directives here rather than in CXXDEFINES because * put cpp directives here rather than in CXXDEFINES because
@ -95,8 +95,6 @@ CXXTEMPLATEFLAGS =
M4 = /usr/bin/m4 M4 = /usr/bin/m4
CXXEXTRA_DEFINES = -fpermissive
#endif #endif
#if defined(RsArchitecture) #if defined(RsArchitecture)