Author: jim
Date: Thu Jul 5 17:56:20 2018
New Revision: 1835164
URL: http://svn.apache.org/viewvc?rev=1835164&view=rev
Log:
Ugg. It looks like versioning has also crept in other
places so we need to "handle" it somehow w/ macOS.
The easiest way is simply make hard links to the
real dylibs to the "versioned" number ones.
Modified:
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1835164&r1=1835163&r2=1835164&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Thu Jul 5 17:56:20
2018
@@ -302,6 +302,14 @@ $(call gb_Helper_abbreviate_dirs,\
rm -f $${DYLIB_FILE})
endef
+define gb_LinkTarget__command_symlink_udk_versioned_library
+ $(if $(call gb_Library_is_udk_versioned,$(1)),
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(1).$(gb_UDK_MAJOR) $(notdir
$(1)).$(gb_UDK_MAJOR) && \
+ ln $(1) $(1).$(gb_UDK_MAJOR) && \
+ ln $(1) $(notdir $(1)).$(gb_UDK_MAJOR) ))
+endef
+
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
define gb_LinkTarget__command_staticlink
$(call gb_Helper_abbreviate_dirs,\
@@ -317,6 +325,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call
gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(call
gb_LinkTarget__command_symlink_udk_versioned_library,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call
gb_LinkTarget__command_staticlink,$(1)))
endef
