[Libreoffice-commits] .: 2 commits - .gitignore solenv/gbuild

[Michael Stahl]

 .gitignore                       |    5 ++++-
 solenv/gbuild/platform/macosx.mk |   13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit e0c780d3c227abfe031dae879e08b9ad920e8a3c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 19 18:22:26 2011 +0100

    .gitignore: better VIM swp pattern

diff --git a/.gitignore b/.gitignore
index af084f9..b783183 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,12 @@
 # backup and temporary files
 *~
-.*.sw[op]
+.*sw?
 \#*
 .DS_Store
 
+# StGit
+.stgit-edit.txt
+
 # python generated file
 *.pyc
 
commit a0a21ffa5b4198735823802e4ab516120393609c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Dec 19 18:10:39 2011 +0100

    gbuild: macosx.mk: install names with SOVERSION:
    
    gb_LinkTarget__get_installname should append the SOVERSION, because the
    installation set only contains the versioned libraries, not the
    unversioned symlinks.

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fb02a58..f7f3440 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -149,11 +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":
+# $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
 define gb_LinkTarget__get_installname
-$(if $(2),-install_name '$(2)$(1)$(if $(filter $(1),libuno_salhelpergcc3.dylib),.3)',$(error
-    cannot determine -install_name for $(2)))
+$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))',
+	$(call gb_Output_error,cannot determine -install_name for $(3)))
 endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -293,11 +292,13 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
 
 define gb_Library_get_rpath
-$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
+$(call gb_LinkTarget__get_installname,$(call gb_Library_get_filename,$(1)),$(2),$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))))
 endef
 
+# RPATH def is delayed until the link command to get current value of SOVERSION
 define gb_Library_Library_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call gb_Library_get_rpath,$(1))
+$(call gb_LinkTarget_get_target,$(2)) : \
+	RPATH = $$(call gb_Library_get_rpath,$(1),$$(SOVERSION))
 $(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call gb_Library_get_layer,$(1))
 
 endef