From a4312af08cbd8c69ba4bead9608f3bf549caf7a0 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 28 Jul 2011 19:11:15 +0200 Subject: convert salhelper to gbuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a cherry-pick of Matúš's e2f30c078fcf26d481c2e90398b450f6c475a483 from the feature/gbuild branch, with the following modifications by Stephan Bergmann : * Adapt salhelper/Makefile to what all those Makefiles currently need to look like. * Do not remove salhelper/source/gcc3.map, instead add directly into it what otherwise solenv/bin/addsym.awk would add to it on Linux. * In salhelper/Library_salhelper.mk, add code that on Linux takes care of the soname and symbol versioning required for backwards compatibility. Solaris would need those features too, and its backwards compatibility is thus currently broken. Also add a bad hack to create the soname symlink (xxx.3 -> xxx) in the solver needed on non-Windows platforms (it is a bad hack for now in that it e.g. is not removed by "make clean"). * In solenv/gbuild/platform/macosx.mk, add an even worse hack to set the correct install name for libuno_salhelpergcc3.dylib.3, with a trailing ".3". --- solenv/gbuild/platform/macosx.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 5be5001f22fd..e061c6dac8c7 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -149,8 +149,10 @@ gb_LinkTarget__RPATHS := \ SDKBIN: \ NONE:@__VIA_LIBRARY_PATH__@ \ +# The below contains a bad hack to set the correct install name for +# libuno_salhepergcc3.dylib.3, with a trailing ".3": define gb_LinkTarget__get_installname -$(if $(2),-install_name '$(2)$(1)',$(error +$(if $(2),-install_name '$(2)$(1)$(if $(filter $(1),libuno_salhelpergcc3.dylib),.3)',$(error cannot determine -install_name for $(2))) endef -- cgit