Clean up ExternalProject_firebird even further for Mac OS X

Change-Id: I4a874c0a71c156786f1a6905aadc0bab572a0a7b

3 files changed, 6 insertions, 130 deletions

diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk
index 0571cd49ad31..3778d52a3383 100644
--- a/firebird/ExternalPackage_firebird.mk
+++ b/firebird/ExternalPackage_firebird.mk
@@ -14,14 +14,12 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
 ifeq ($(OS)-$(COM),WNT-MSC)
 $(eval $(call gb_ExternalPackage_add_file,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
 $(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib))
-else
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
 else
 $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2))
 $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5))
 $(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk
index bcfbe40dfe87..296848efd62c 100644
--- a/firebird/ExternalProject_firebird.mk
+++ b/firebird/ExternalProject_firebird.mk
@@ -45,10 +45,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
 			--disable-superserver \
 			--with-system-icu --without-fbsample --without-fbsample-db \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-		&& export CHANGE_INSTALL_NAMES_APP="$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app NONE" \
-		&& export CHANGE_INSTALL_NAMES_SHL="$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO" \
 		&& $(gb_Helper_set_ld_path) $(MAKE) firebird_embedded \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
 	)
 # vim: set noet sw=4 ts=4:
diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1
index 2e437ab3dba6..adede1c98688 100644
--- a/firebird/firebird-macosx.patch.1
+++ b/firebird/firebird-macosx.patch.1
@@ -1,126 +1,4 @@
 # -*- Mode: Diff -*-
-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_APP) $@
- 
- # 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_APP) $@
- 
- $(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_APP) $@
- 
- $(EXAMPLES_DEST)/intlbld.c:	$(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e
- 
---- firebird.org/builds/posix/Makefile.in.libfbembed
-+++ firebird/builds/posix/Makefile.in.libfbembed
-@@ -63,6 +63,7 @@
- 
- $(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
- 	$(LINK_EMBED) -o $@ $^ $(LINK_EMBED_LIBS)
-+	$(CHANGE_INSTALL_NAMES_SHL) $@
- 
- $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
- 	(cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )
-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_APP) $@
- 
- 
- 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_APP) $@
- 
- 
- 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_APP) $@
- 
- 
- 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_APP) $@
- 
- 
- 
-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_APP) $(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_APP) $@
- 
- 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_APP) $(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_APP) $@
- 
- include $(ROOT)/gen/make.shared.targets
- 
 --- firebird.org/builds/posix/darwin.defaults
 +++ firebird/builds/posix/darwin.defaults
 @@ -32,17 +32,17 @@
@@ -132,7 +10,7 @@ diff -ur firebird.org/builds/posix/Makefile.in.static.isql firebird/builds/posix
 -LIB_CLIENT_LINK_OPTIONS:=-install_name /Library/Frameworks/Firebird.framework/Versions/A/Firebird
 -FBEMBED_LINK:=-F../gen/firebird -framework Firebird -L$(LIB) -lfbembed $(ICU_LIBS)
 +LIB_LINK_RPATH:=
-+LIB_EMBED_LINK_OPTIONS:=-install_name @loader_path/libfbembed.dylib
++LIB_EMBED_LINK_OPTIONS:=-install_name @__________________________________________________OOO/libfbembed.dylib
 +LIB_CLIENT_LINK_OPTIONS:=
 +FBEMBED_LINK:=-L$(LIB) -lfbembed $(ICU_LIBS)
  PLATFORM_FALLBACK=os/posix