diff options
author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-15 13:07:14 +0200 |
---|---|---|
committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-16 16:40:16 +0200 |
commit | 5b73917ce5cf4d074109c79e43828b132eb9b66e (patch) | |
tree | 056d9c82ca6b87946a0fb18b0b7c5b047b16b89f /firebird/firebird-macosx.patch.1 | |
parent | 70e7e92755a12543ac3e4509d590a5d7d5de48c3 (diff) |
Patch firebird to build on Mac.
Change-Id: I47ac500922d7e834f5915cc8fb1e19d584675620
Diffstat (limited to 'firebird/firebird-macosx.patch.1')
-rw-r--r-- | firebird/firebird-macosx.patch.1 | 153 |
1 files changed, 153 insertions, 0 deletions
diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1 new file mode 100644 index 000000000000..5794a9648a36 --- /dev/null +++ b/firebird/firebird-macosx.patch.1 @@ -0,0 +1,153 @@ +Only in firebird: Makefile +Only in firebird: build.log +diff -ur firebird.org/builds/posix/Makefile.in.codes firebird/builds/posix/Makefile.in.codes +--- firebird.org/builds/posix/Makefile.in.codes 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.codes 2013-07-15 11:43:26.000000000 +0200 +@@ -63,7 +63,7 @@ + + $(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) +- ++ $(CHANGE_INSTALL_NAMES) $@ + + # Rebuild ids.h + $(SRC_ROOT)/include/gen/ids.h: $(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h +diff -ur firebird.org/builds/posix/Makefile.in.examples firebird/builds/posix/Makefile.in.examples +--- firebird.org/builds/posix/Makefile.in.examples 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.examples 2013-07-15 11:50:37.000000000 +0200 +@@ -129,6 +129,7 @@ + + $(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) ++ $(CHANGE_INSTALL_NAMES) $@ + + $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e + +@@ -147,6 +148,7 @@ + + $(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(EXE_LINK) $(LINK_OPTS) $(INTLBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) ++ $(CHANGE_INSTALL_NAMES) $@ + + $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e + +diff -ur firebird.org/builds/posix/Makefile.in.msgs firebird/builds/posix/Makefile.in.msgs +--- firebird.org/builds/posix/Makefile.in.msgs 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.msgs 2013-07-15 11:37:17.000000000 +0200 +@@ -107,6 +107,7 @@ + $(BUILD_FILE): $(BUILD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $(BUILD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) + $(CHMOD_7) $@ ++ $(CHANGE_INSTALL_NAMES) $@ + + + enter_messages : $(ENTER_MESSAGES) +@@ -114,6 +115,7 @@ + $(ENTER_MESSAGES): $(ENTER_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $(ENTER_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) + $(CHMOD_7) $@ ++ $(CHANGE_INSTALL_NAMES) $@ + + + modify_messages: $(MODIFY_MESSAGES) +@@ -121,6 +123,7 @@ + $(MODIFY_MESSAGES): $(MODIFY_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $(MODIFY_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) + $(CHMOD_7) $@ ++ $(CHANGE_INSTALL_NAMES) $@ + + + change_messages: $(CHANGE_MESSAGES) +@@ -128,6 +131,7 @@ + $(CHANGE_MESSAGES): $(CHANGE_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $(CHANGE_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS) + $(CHMOD_7) $@ ++ $(CHANGE_INSTALL_NAMES) $@ + + + +diff -ur firebird.org/builds/posix/Makefile.in.static.createdb firebird/builds/posix/Makefile.in.static.createdb +--- firebird.org/builds/posix/Makefile.in.static.createdb 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.static.createdb 2013-07-15 10:12:21.000000000 +0200 +@@ -59,6 +59,7 @@ + + $(CREATE_DB): $(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) ++ $(CHANGE_INSTALL_NAMES) $(CREATE_DB) + + + include $(ROOT)/gen/make.shared.targets +diff -ur firebird.org/builds/posix/Makefile.in.static.gbak firebird/builds/posix/Makefile.in.static.gbak +--- firebird.org/builds/posix/Makefile.in.static.gbak 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.static.gbak 2013-07-15 11:25:41.000000000 +0200 +@@ -60,7 +60,7 @@ + + $(GBAK_STATIC) : $(AllObjects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) +- ++ $(CHANGE_INSTALL_NAMES) $@ + + include $(ROOT)/gen/make.shared.targets + +diff -ur firebird.org/builds/posix/Makefile.in.static.gpre firebird/builds/posix/Makefile.in.static.gpre +--- firebird.org/builds/posix/Makefile.in.static.gpre 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.static.gpre 2013-07-15 10:12:34.000000000 +0200 +@@ -61,6 +61,7 @@ + $(GPRE_STATIC): $(GPRESTATIC_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS) + -$(RM) $(GPRE_CURRENT) ++ $(CHANGE_INSTALL_NAMES) $(GPRE_STATIC) + (cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT))) + + +diff -ur firebird.org/builds/posix/Makefile.in.static.isql firebird/builds/posix/Makefile.in.static.isql +--- firebird.org/builds/posix/Makefile.in.static.isql 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/Makefile.in.static.isql 2013-07-15 11:27:32.000000000 +0200 +@@ -60,7 +60,7 @@ + + $(ISQL_STATIC): $(ISQL_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A) + $(STATICEXE_LINK) $(LINK_OPTS) $(ISQL_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS) +- ++ $(CHANGE_INSTALL_NAMES) $@ + + include $(ROOT)/gen/make.shared.targets + +diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin +--- firebird.org/builds/posix/postfix.darwin 2013-07-12 20:55:46.000000000 +0200 ++++ firebird/builds/posix/postfix.darwin 2013-07-15 12:07:36.000000000 +0200 +@@ -54,9 +54,9 @@ + cp -r ../gen/firebird/include $(FB_FW)/Versions/A/Headers + cp ../gen/firebird/lib/libfbembed.dylib $(FB_FW)/Versions/A/Firebird + cp ../gen/firebird/lib/libfbclient.dylib $(FB_FW)/Versions/A/Libraries/libfbclient.dylib +- cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib +- cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib +- cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib ++ #cp ../gen/firebird/lib/libicudata.dylib $(FB_FW)/Versions/A/Libraries/libicudata.dylib ++ #cp ../gen/firebird/lib/libicui18n.dylib $(FB_FW)/Versions/A/Libraries/libicui18n.dylib ++ #cp ../gen/firebird/lib/libicuuc.dylib $(FB_FW)/Versions/A/Libraries/libicuuc.dylib + cp ../gen/firebird/lib/libib_util.dylib $(FB_FW)/Versions/A/Libraries/libib_util.dylib + cp ../gen/firebird/firebird.msg \ + $(FB_FW)/Resources/English.lproj/var/firebird.msg +@@ -68,8 +68,8 @@ + $(FB_FW)/Resources/English.lproj/var/intl/fbintl.conf + chmod a+rx $(FB_FW)/Resources/English.lproj/var/intl/fbintl + mkdir -p $(FB_FW)/Resources/English.lproj/var/plugins +- cp ../gen/firebird/plugins/libfbtrace.dylib \ +- $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib ++# cp ../gen/firebird/plugins/libfbtrace.dylib \ ++# $(FB_FW)/Resources/English.lproj/var/plugins/libfbtrace.dylib + cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help + cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var + mkdir -p $(FB_FW)/Resources/doc +Only in firebird: config.log +Only in firebird: config.status +Only in firebird/extern/btyacc: btyacc +Only in firebird: gen +Only in firebird: libtool +Only in firebird/src/dsql: dsql.tab.h +Only in firebird/src/dsql: parse.cpp +Only in firebird/src/gpre: gpre_meta.cpp +Only in firebird/src/include/gen: autoconfig.h +Only in firebird/src/include/gen: blrtable.h +Only in firebird/src/misc: codes.cpp +Only in firebird: temp |