mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop broken filter-out of -bind_at_load for Executable_soffice_bin on macOS

Browse Source 
We generally use -bind_at_load ("Sets a bit in the mach header of the resulting
binary which tells dyld to bind all symbols when the binary is loaded, rather
than lazily." according to Xcode 11.3.1 ld(1) man page) since
4c9c1957cf "INTEGRATION: CWS geordi2q01: #i18350#:
join changes from CWS ooo11rc3" (lacking any explanation; later carried over
into solenv/gbuild/platform/macosx.mk).

And we filtered out -bind_at_load for Executable_soffice_bin (and others, back
then, which have become irrelevant by now) with
13be934b43 "INTEGRATION: CWS geordi2q14: #111934#:
merge CWS ooo111fix2" (again, lacking any explanation).

However, the latter was effectively broken when
6df9c479f5 "gbuildize desktop" rewrote it in
desktop/Executable_soffice.bin.mk as

  $(eval $(call gb_Executable_set_ldflags,\
      $(filter-out -bind_at_load,$$(LDFLAGS)) \
  ))

lacking an "soffice_bin," at the end of the first line.

Given that the soffice executable is apparently built with -bind_at_load ever
since 2011, without causing any issues, lets assume that filtering it out is no
longer necessary (if it ever was), and drop that.

(Maybe it was once necessary for some reason when the file system layout of OOo/
LO executables and dynamic libraries was different.  But today, the soffice
executable finds its dependent libraries, sal and sofficeapp, via
@executable_path just fine.)

Change-Id: Ifa379237cce4fa6d5ea0e2c1f1d84263f9007c50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88680
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2020-02-14 11:22:22 +01:00
parent 0d3d40b266
commit f67e5ef9a5
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/Executable_soffice_bin.mk
View File

@@ -25,10 +25,6 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
ifeq ($(OS),MACOSX)
$(eval $(call gb_Executable_set_ldflags,\
$(filter-out -bind_at_load,$$(LDFLAGS)) \
))
# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX load command's sdk
# value from 10.15 to "n/a" (i.e., 0.0) is necessary to avoid blurry text in the LO UI:
$(eval $(call gb_Executable_add_ldflags,soffice_bin, \