firebird: remove the part of the patch that only reorders link arguments

Change-Id: I96a4d70ae975ce4b6caf9dffaa87b35a66696447

1 files changed, 0 insertions, 281 deletions

diff --git a/firebird/firebird-cygwin-msvc.patch.1 b/firebird/firebird-cygwin-msvc.patch.1
index 717ec09fec3e..e4d01c606e9d 100644
--- a/firebird/firebird-cygwin-msvc.patch.1
+++ b/firebird/firebird-cygwin-msvc.patch.1
@@ -92,53 +92,6 @@ diff -u firebird/builds/posix/make.defaults firebird/builds/posix/make.defaults
  ifeq ($(EDITLINE_FLG),Y)
    ifeq ($(STD_EDITLINE), true)
 unchanged:
---- firebird.org/builds/posix/make.rules	2013-06-26 10:05:19.351343000 +0100
-+++ firebird/builds/posix/make.rules	2013-07-02 10:17:28.056489400 +0100
-@@ -46,7 +46,7 @@
- endif
- 
- WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS) $(GLOB_OPTIONS)
--WCXXFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CXXFLAGS) $(GLOB_OPTIONS)
-+WCXXFLAGS:=  $(WFLAGS) $(CXXFLAGS) $(GLOB_OPTIONS) $(THR_FLAGS) 
- 
- # Here we have definitions for using the preprocessor.
- 
-@@ -89,27 +96,27 @@
- .SUFFIXES: .lo .o .cpp .c
- 
- $(OBJ)/jrd/%.o: $(SRC_ROOT)/jrd/$(PLATFORM_PATH)/%.cpp
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX)  -c $(firstword $<) -o $@ $(WCXXFLAGS)
- 
- $(OBJ)/utilities/ntrace/%.o: $(SRC_ROOT)/utilities/ntrace/$(PLATFORM_PATH)/%.cpp
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX) -c $(firstword $<) -o $@ $(WCXXFLAGS)
- 
- ifneq ($(strip $(PLATFORM_FALLBACK)),)
- $(OBJ)/jrd/%.o: $(SRC_ROOT)/jrd/$(PLATFORM_FALLBACK)/%.cpp
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX) -c $(firstword $<) -o $@ $(WCXXFLAGS)
- 
- $(OBJ)/utilities/ntrace/%.o: $(SRC_ROOT)/utilities/ntrace/$(PLATFORM_FALLBACK)/%.cpp
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX) -c $(firstword $<) -o $@ $(WCXXFLAGS)
- endif
- 
- $(OBJ)/%.o: $(SRC_ROOT)/%.c 
--	$(CC) $(WCFLAGS) -c $(firstword $<) -o $@
-+	$(CC) -c $(firstword $<) -o $@ $(WCFLAGS)
- 
- $(OBJ)/%.o: $(OBJ)/%.cpp 
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX) -c $(firstword $<) -o $@ $(WCXXFLAGS)
- 
- $(OBJ)/%.o: $(SRC_ROOT)/%.cpp 
--	$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
-+	$(CXX) -c $(firstword $<) -o $@ $(WCXXFLAGS)
- 
- .SUFFIXES: .epp .e
- 
-unchanged:
 --- firebird.org/builds/posix/make.shared.targets	2013-06-26 10:05:19.351343000 +0100
 +++ firebird/builds/posix/make.shared.targets	2013-07-01 10:55:25.435124900 +0100
 @@ -89,7 +93,7 @@
@@ -176,97 +129,6 @@ unchanged:
  	(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))
  
 unchanged:
---- firebird.org/builds/posix/Makefile.in.client.util	2013-06-26 10:05:19.351343000 +0100
-+++ firebird/builds/posix/Makefile.in.client.util	2013-07-01 06:24:30.937646200 +0100
-@@ -145,75 +145,75 @@
- nbackup: $(LIBFBCLIENT_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LINK_LIBS)
- 
- fb_lock_print: $(LIBFBCLIENT_SO) $(LOCKPRINT)
- 
- $(LOCKPRINT):	$(LOCKPRINT_Objects) $(COMMON_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LINK_LIBS)
- 
- 
- gstat : $(LIBFBCLIENT_SO) $(GSTAT)
- 
- $(GSTAT):	$(GSTAT_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects) $(FBCONFIG_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LINK_LIBS)
- 
- 
- gds_drop: $(GDS_DROP)
- 
- $(GDS_DROP):	$(DROP_Objects) $(LIBFBCLIENT_SO)  
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(DROP_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-+	$(EXE_LINK) $(DROP_Objects) -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LINK_LIBS)
- 
- 
- fbsvcmgr: $(FBSVCMGR)
- 
- $(FBSVCMGR):	$(FBSVCMGR_Objects) $(LIBFBCLIENT_SO)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) $(LINK_LIBS)
- 
- 
- fbtracemgr: $(FBTRACEMGR)
- 
- $(FBTRACEMGR):	$(FBTRACEMGR_Objects) $(LIBFBCLIENT_SO)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) $(LINK_LIBS)
- 
- 
- fbguard: $(LIBFBCLIENT_SO) $(FBGUARD)
- 
- $(FBGUARD):	$(FBGUARD_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
- 
- 
- ibguard: $(LIBFBCLIENT_SO) $(IBGUARD)
- 
- $(IBGUARD):	$(IBGUARD_A_Objects) $(IBGUARD_B_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(FBCLASSES_Objects) $(FBCOMMON_Objects) -lfbclient \
-+	$(EXE_LINK) $^ -o $@ -L$(LIB) $(FBCLASSES_Objects) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS)$(FBCOMMON_Objects) -lfbclient \
- $(LIB_GUI) $(LINK_LIBS)
- 
- 
- fbmgr_bin: $(FBMGR_BIN)
- 
- $(FBMGR_BIN):	$(FBMGR_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(FBCLASSES_Objects) $(FBCOMMON_Objects) -lfbclient \
-+	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBCLASSES_Objects) $(FBCOMMON_Objects) -lfbclient \
- $(LINK_LIBS)
- 
- 
- instreg: $(INSTREG)
- 
- $(INSTREG):	$(INSTREG_Objects) 
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) 
-+	$(EXE_LINK) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS)
- 
- 
- instsvc: $(INSTSVC)
- 
- $(INSTSVC):	$(INSTSVC_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) 
-+	$(EXE_LINK) $^ -o $@ -L$(LIB)  $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(LINK_LIBS) 
- 
- # This one needs a bit of work.
- 
- rebuild: $(GDS_REBUILD)
- 
- $(GDS_REBUILD):	$(REBUILD_Objects) $(LIBFBCLIENT_SO)  
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(REBUILD_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
-+	$(EXE_LINK) $(REBUILD_Objects) -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LINK_LIBS)
- 
- include $(ROOT)/gen/make.shared.targets
- 
-unchanged:
 --- firebird.org/builds/posix/Makefile.in.codes	2013-06-26 10:05:19.351343000 +0100
 +++ firebird/builds/posix/Makefile.in.codes	2013-07-03 16:29:45.287324700 +0100
 @@ -62,7 +62,7 @@
@@ -279,149 +141,6 @@ unchanged:
  
  # Rebuild ids.h
 unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.gdef	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.gdef	2013-07-01 06:43:13.162649600 +0100
-@@ -63,7 +63,7 @@
- gdef:   $(GDEF)
- 
- $(GDEF): $(GDEF_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK)  $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- 
-unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.gfix	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.gfix	2013-07-01 06:42:56.860620900 +0100
-@@ -59,7 +59,7 @@
- gfix : $(LIBFBEMBED_SO) $(GFIX)
- 
- $(GFIX):	$(AllObjects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- include $(ROOT)/gen/make.shared.targets
-unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.gpre	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.gpre	2013-07-01 06:42:39.507726200 +0100
-@@ -58,7 +58,7 @@
- gpre : $(LIBFBEMBED_SO) $(GPRE)
- 
- $(GPRE):	$(GPRE_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- include $(ROOT)/gen/make.shared.targets
-unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.isql	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.isql	2013-07-01 06:41:27.102820600 +0100
-@@ -59,7 +59,7 @@
- isql : $(LIBFBEMBED_SO) $(ISQL)
- 
- $(ISQL):	$(ISQL_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LIBEDITLINE) $(LINK_LIBS)
-+	$(EXE_LINK)  $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LIBEDITLINE) $(LINK_LIBS)
- 
- 
- include $(ROOT)/gen/make.shared.targets
-unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.qli	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.qli	2013-07-01 06:41:01.690376000 +0100
-@@ -61,7 +61,7 @@
- qli : create_yachts $(LIBFBEMBED_SO) $(QLI)
- 
- $(QLI): $(QLI_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK)  $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- # EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail
- #      with it. metadata.fdb is what is needed here.
-unchanged:
---- firebird.org/builds/posix/Makefile.in.embed.util	2013-06-26 10:05:19.366787100 +0100
-+++ firebird/builds/posix/Makefile.in.embed.util	2013-07-01 06:40:25.950713200 +0100
-@@ -139,68 +139,68 @@
- nbackup: $(LIBFBEMBED_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- fb_lock_print: $(LIBFBEMBED_SO) $(LOCKPRINT)
- 
- $(LOCKPRINT):	$(LOCKPRINT_Objects) $(COMMON_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- gstat : $(LIBFBEMBED_SO) $(GSTAT)
- 
- $(GSTAT):	$(GSTAT_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects) $(FBCONFIG_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- gds_drop: $(GDS_DROP)
- 
- $(GDS_DROP):	$(DROP_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- fbsvcmgr: $(FBSVCMGR)
- 
- $(FBSVCMGR):	$(FBSVCMGR_Objects) $(LIBFBEMBED_SO)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- fbtracemgr: $(FBTRACEMGR)
- 
- $(FBTRACEMGR):	$(FBTRACEMGR_Objects) $(LIBFBEMBED_SO)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- gds_relay: $(GDS_RELAY)
- 
- $(GDS_RELAY):	$(RELAY_Objects) $(LIBFBEMBED_SO)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(RELAY_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $(RELAY_Objects) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS)  $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- gsec: $(GSEC)
- 
- $(GSEC):	$(GSEC_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- 
- fbguard: $(LIBFBCLIENT_SO) $(FBGUARD)
- 
- $(FBGUARD):	$(FBGUARD_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
-+	$(EXE_LINK)  $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
- 
- 
- ibmgr_bin: $(IBMGR_BIN)
- 
- $(IBMGR_BIN):	$(IBMGR_Objects) $(LIBFBEMBED_SO)  
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(IBMGR_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $(IBMGR_Objects) -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- # This one needs a bit of work.
- 
- rebuild: $(GDS_REBUILD)
- 
- $(GDS_REBUILD):	$(REBUILD_Objects) $(LIBFBEMBED_SO)  
--	$(EXE_LINK) $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(REBUILD_Objects) -o $@ $(FBEMBED_LINK) $(LINK_LIBS)
-+	$(EXE_LINK) $(REBUILD_Objects) $^ -o $@ $(LINK_EMPTY_SYMBOLS) $(LINK_OPTS) $(FBEMBED_LINK) $(LINK_LIBS)
- 
- include $(ROOT)/gen/make.shared.targets
- 
-unchanged:
 --- firebird/builds/posix/Makefile.in.examples	2013-07-04 14:22:42.262676600 +0100
 +++ firebird/builds/posix/Makefile.in.examples	2013-07-05 10:14:02.897675100 +0100
 @@ -64,10 +64,13 @@