[patch] patch required by attachment #734305

firebird-4.0.0-comp_flags.patch (text/plain), 2.48 KB, created by Thomas J. Moore on 2021-08-19 17:46:01 UTC

# Compile externs with same CXX/CC/CFLAGS/CXXFLAGS/LDFLAGS as main
--- Firebird-4.0.0.2496-0/builds/posix/Makefile.in	2021-05-29 10:05:05.000000000 -0500
+++ Firebird-4.0.0.2496-0/builds/posix/Makefile.in	2021-08-17 12:26:55.251099602 -0500
@@ -164,13 +164,13 @@
 #
 
 external:
-	$(MAKE) -C $(ROOT)/extern/btyacc
-	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
+	$(MAKE) -C $(ROOT)/extern/btyacc CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop CXX="$(CXX)" CXXFLAGS="$(OPTIMIZE_FLAGS)" CFLAGS="${CFLAGS}" CC="${CC}" LDFLAGS="$(LDDFLAGS)"
 
-	$(MAKE) -C $(ROOT)/extern/decNumber
+	$(MAKE) -C $(ROOT)/extern/decNumber CC="${CC}" CFLAGS="${CFLAGS}"
 	ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(LIB)
 
-	CXXFLAGS="-O3 -g -fPIC" $(MAKE) -C $(ROOT)/extern/re2
+	CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -fPIC" $(MAKE) -C $(ROOT)/extern/re2
 	ln -sf $(ROOT)/extern/re2/obj/libre2.a $(LIB)
 
 ifeq ($(TOMMATH_BUILD_FLG),Y)
@@ -653,8 +653,8 @@
 	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
 
 examples: include_generic
-	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
-	$(MAKE) -f Makefile.plugins_examples
+	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	$(MAKE) -f Makefile.plugins_examples CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 message_file:	$(FIREBIRD_MSG)
 
--- Firebird-4.0.0.2496-0/extern/cloop/Makefile	2021-05-29 10:05:05.000000000 -0500
+++ Firebird-4.0.0.2496-0/extern/cloop/Makefile	2021-08-17 12:46:20.796054113 -0500
@@ -54,10 +54,10 @@
 
 define compile
 $1/%.o: %.c
-	$(CC) -c $$(C_FLAGS) $$< -o $$@
+	$(CC) -c $$(CFLAGS) -fPIC $$< -o $$@
 
 $1/%.o: %.cpp
-	$(CXX) -c $$(CXX_FLAGS) $$< -o $$@
+	$(CXX) -c $$(CXXFLAGS) -fPIC $$< -o $$@
 endef
 
 .PHONY: all mkdirs clean
--- Firebird-4.0.0.2496-0/extern/decNumber/Makefile	2021-05-29 10:05:05.000000000 -0500
+++ Firebird-4.0.0.2496-0/extern/decNumber/Makefile	2021-08-19 11:11:04.316897692 -0500
@@ -2,7 +2,7 @@
 
 $(LIBRARY):		$(wildcard *.c) $(wildcard *.h) Makefile
 	$(RM) -f *.o
-	$(CC) $(CROSS_FLAGS) -c -O3 -fPIC $(subst decCommon.c,,$(subst decBasic.c,,$(wildcard *.c)))
+	$(CC) $(CROSS_FLAGS) -c ${CFLAGS} -fPIC $(subst decCommon.c,,$(subst decBasic.c,,$(wildcard *.c)))
 	$(AR) crs $(LIBRARY) *.o
 	$(RM) -f *.o