Author: jim
Date: Tue Jul 3 22:41:51 2018
New Revision: 1835031
URL: http://svn.apache.org/viewvc?rev=1835031&view=rev
Log:
Just avoid versioning totally w/ macOS... it doesn't work like Linux and others
and the format is totally different, from what I can tell...
Modified:
openoffice/trunk/main/solenv/gbuild/Library.mk
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
Modified: openoffice/trunk/main/solenv/gbuild/Library.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Library.mk?rev=1835031&r1=1835030&r2=1835031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Library.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Library.mk Tue Jul 3 22:41:51 2018
@@ -102,7 +102,6 @@ gb_Library_get_runtime_filename = \
define gb_Library_is_udk_versioned
$(or \
- $(filter-out $(OS),MACOSX),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_RTVERLIBS)),\
$(filter $(patsubst %:$(notdir $(1)),%,$(filter %:$(notdir
$(1)),$(gb_Library_FILENAMES))),$(gb_Library_UNOVERLIBS)))
endef
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1835031&r1=1835030&r2=1835031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Tue Jul 3 22:41:51
2018
@@ -287,8 +287,6 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) $(gb_macos_LDFLAGS) \
- $(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
- $(if $(call
gb_Library_is_udk_versioned,$(1)),-Wl$(COMMA)-h$(notdir $(1)).$(gb_UDK_MAJOR)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
@@ -296,7 +294,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
- -o $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
+ -o $(1) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library
$(LAYER) $(1) && \
@@ -304,12 +302,6 @@ $(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) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR)
$(1)))
-endef
-
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
define gb_LinkTarget__command_staticlink
$(call gb_Helper_abbreviate_dirs,\
@@ -325,7 +317,6 @@ 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
@@ -334,7 +325,6 @@ endef
gb_Library_DEFS :=
gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
-gb_Library_VERSIONMAPFLAG := -Wl,-exported_symbols_list
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
@@ -383,11 +373,7 @@ endef
define gb_Library_Library_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call
gb_Library_get_rpath,$(1))
$(call gb_LinkTarget_get_target,$(2)) : LAYER := $(call
gb_Library_get_layer,$(1))
-ifneq (,$(call gb_Library_is_udk_versioned,$(call gb_Library_get_target,$(1))))
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
- $(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR)
-endif
+
endef
