Attachment #276273 for bug #264955




# 

external_libraries:

	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
endif
ifeq ($(STD_EDITLINE),false)
ifeq ($(EDITLINE_FLG),Y)
	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
endif
endif

btyacc_binary: $(BTYACC)


Lines 233-243 Link Here

(-)builds/posix/make.defaults.orig (-5 / +1 lines)
233	LIBFBSTATIC_A = $(LIB)/libfbstatic.a	233	LIBFBSTATIC_A = $(LIB)/libfbstatic.a
234		234
235	ifeq ($(EDITLINE_FLG),Y)	235	ifeq ($(EDITLINE_FLG),Y)
236	ifeq ($(STD_EDITLINE), true)	236	LIBEDITLINE := -ledit
237	LIBEDITLINE := -l$(READLINE)
238	else
239	LIBEDITLINE := $(LIB)/libedit.a
240	endif
241	endif	237	endif
242		238
243	LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \	239	LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \





# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
ifeq ($(STD_ICU),false)
  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
endif

ifeq ($(IsProdTypeBuild),Y)
  CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD


.SUFFIXES: .c .e .epp .cpp

.e.c: $(GPRE_CURRENT)
	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@



Lines 49-55 Link Here

(-)builds/posix/make.shared.targets.orig (-1 / +1 lines)
49		49
50	# gpre_meta needs a special boot build since there is no database.	50	# gpre_meta needs a special boot build since there is no database.
51		51
52	$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp	52	$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
53	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@	53	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
54		54
55		55

Lines 22-31 Link Here

(-)builds/posix/prefix.linux.orig (-2 / +2 lines)
22	# you may remove it if engine is getting compiled with any other GCC version	22	# you may remove it if engine is getting compiled with any other GCC version
23		23
24	COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0	24	COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
25	OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin	25	COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
26	WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable	26	WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
27		27
28	PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)	28	PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
29	DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)	29	DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
30	#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)	30	#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)

Return to bug 264955

Lines 185-198 Link Here

(-)builds/posix/Makefile.in.firebird.orig (-8 / +1 lines)
185	#	185	#
186		186
187	external_libraries:	187	external_libraries:
188	ifeq ($(STD_ICU),false)	188
189	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
190	endif
191	ifeq ($(STD_EDITLINE),false)
192	ifeq ($(EDITLINE_FLG),Y)
193	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
194	endif
195	endif
196		189
197	btyacc_binary: $(BTYACC)	190	btyacc_binary: $(BTYACC)
198		191

Lines 33-41 Link Here

(-)builds/posix/make.rules.orig (-4 / +1 lines)
33		33
34	# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002	34	# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
35	CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan	35	CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
36	ifeq ($(STD_ICU),false)
37	CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
38	endif
39		36
40	ifeq ($(IsProdTypeBuild),Y)	37	ifeq ($(IsProdTypeBuild),Y)
41	CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD	38	CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
Lines 69-75 Link Here
69		66
70	.SUFFIXES: .c .e .epp .cpp	67	.SUFFIXES: .c .e .epp .cpp
71		68
72	.e.c:	69	.e.c: $(GPRE_CURRENT)
73	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@	70	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
74		71
75		72