[Libreoffice-commits] core.git: external/firebird

[Stephan Bergmann (via logerrit)]

 external/firebird/firebird-macosx.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17244646ff52dcb2a5d043e9a9ce0eaa8d23414d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 16 15:22:55 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Nov 16 20:02:48 2020 +0100

    Modify the non-symlink libfbclient.dylib.3.0.0
    
    At least in my --enable-debug build,
    workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib originally contains
    
      libfbclient.dylib -> libfbclient.dylib.2
      libfbclient.dylib.2 -> libfbclient.dylib.3.0.0
      libfbclient.dylib.3.0.0
    
    so if we modify libfbclient.dylib with install_name_tool, it will break the
    symlink and modify libfbclient.dylib but not libfbclient.dylib.3.0.0---where the
    latter is what gets delivered via external/firebird/ExternalPackage_firebird.mk.
    
    (This didn't cause any issues, though, because gb_LinkTarget__use_libfbembed in
    RepositoryExternal.mk links against the modified libfbclient.dylib in workdir,
    not against the delivered libfbclient.dylib.3.0.0, so e.g. Library_firebird_sdbc
    did already contain the correct @loader_path/libfbclient.dylib.3.0.0 reference.
    Also, the `install_name_tool -id` treatment of libEngine12.dylib in
    external/firebird/firebird-macosx.patch.1 should not technically be necessary,
    as nothing links against that library; but if left unmodified, it would record
    the build machine's
    
      /full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.dylib
    
    so better "clean it up".  Also, the `install_name_tool -change` treatment of
    libEngine12.dylib in external/firebird/firebird-macosx.patch.1 is necessary
    because otherwise it would record a full-path dependency to
    
      /full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.dylib.3.0.0
    
    which macosx-change-install-names.pl, called from MAKE_POST in
    external/firebird/ExternalProject_firebird.mk, would not adjust.  With all those
    modifications in external/firebird/firebird-macosx.patch.1, the call to
    macosx-change-install-names.pl should effectively have nothing left to do, as
    these libraries do not depend on any other LO-provided libraries, but better
    leave it in place anyway.)
    
    Change-Id: Icf7f2ff5cb844b07be223e0b74cd6a650725777a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105946
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index e379ca738b18..35e631dece68 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -71,7 +71,7 @@
  	$(MAKE) plugins
  	$(MAKE) examples
  	$(MAKE) rest
-+	install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.3.0.0 $(LIB)/libfbclient.dylib
++	install_name_tool -id @__________________________________________________OOO/libfbclient.dylib.3.0.0 $(LIB)/libfbclient.dylib.3.0.0
 +	install_name_tool -id @__________________________________________________OOO/libEngine12.dylib $(PLUGINS)/libEngine12.dylib
 +	install_name_tool -change $(LIB)/libfbclient.dylib.3.0.0 @loader_path/libfbclient.dylib.3.0.0 $(PLUGINS)/libEngine12.dylib