Attachment #191899 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 232-242 Link Here

(-)Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults (-5 / +1 lines)
232	LIBFBSTATIC_A = $(LIB)/libfbstatic.a	232	LIBFBSTATIC_A = $(LIB)/libfbstatic.a
233		233
234	ifeq ($(EDITLINE_FLG),Y)	234	ifeq ($(EDITLINE_FLG),Y)
235	ifeq ($(STD_EDITLINE), true)	235	LIBEDITLINE := -ledit
236	LIBEDITLINE := -leditline
237	else
238	LIBEDITLINE := $(LIB)/libeditline.a
239	endif
240	endif	236	endif
241		237
242	LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \	238	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

(-)Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets (-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





# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
# you may remove it if engine is getting compiled with any other GCC version
COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable

PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)





# not need editline in default libs, but need to test for its presence
saveLIBS=$LIBS
if test "$STD_EDITLINE" = "true"; then
  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
if test "${ac_cv_lib_editline_readline+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-ledit  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF

Return to bug 264955

Lines 185-198 Link Here

(-)Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird (-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 4027-4039 Link Here

(-)Firebird-2.1.2.18118-0_orig/configure (-3 / +3 lines)
4027	# not need editline in default libs, but need to test for its presence	4027	# not need editline in default libs, but need to test for its presence
4028	saveLIBS=$LIBS	4028	saveLIBS=$LIBS
4029	if test "$STD_EDITLINE" = "true"; then	4029	if test "$STD_EDITLINE" = "true"; then
4030	{ echo "$as_me:$LINENO: checking for readline in -leditline" >&5	4030	{ echo "$as_me:$LINENO: checking for readline in -ledit" >&5
4031	echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }	4031	echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
4032	if test "${ac_cv_lib_editline_readline+set}" = set; then	4032	if test "${ac_cv_lib_editline_readline+set}" = set; then
4033	echo $ECHO_N "(cached) $ECHO_C" >&6	4033	echo $ECHO_N "(cached) $ECHO_C" >&6
4034	else	4034	else
4035	ac_check_lib_save_LIBS=$LIBS	4035	ac_check_lib_save_LIBS=$LIBS
4036	LIBS="-leditline $LIBS"	4036	LIBS="-ledit $LIBS"
4037	cat >conftest.$ac_ext <<_ACEOF	4037	cat >conftest.$ac_ext <<_ACEOF
4038	/* confdefs.h. */	4038	/* confdefs.h. */
4039	_ACEOF	4039	_ACEOF

Lines 33-41 Link Here

(-)Firebird-2.1.2.18118-0_orig/builds/posix/make.rules (-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

Lines 20-31 Link Here

(-)Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux (-4 / +2 lines)
20		20
21	# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion	21	# -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
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	COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
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
26	WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable	24	WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
27		25
28	PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)	26	PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
29	DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)	27	DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
30	#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)	28	#DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
31		29