You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/01/14 21:24:02 UTC
svn commit: r1851296 - in /openoffice/trunk/main:
cpputools/Executable_regsingleton.mk cpputools/Executable_sp2bv.mk
solenv/inc/unxmacc.mk solenv/inc/unxmacx.mk
Author: jim
Date: Mon Jan 14 21:24:02 2019
New Revision: 1851296
URL: http://svn.apache.org/viewvc?rev=1851296&view=rev
Log:
Force -dynamiclib with -install_name and allow for max pathlen, just in case
Modified:
openoffice/trunk/main/cpputools/Executable_regsingleton.mk
openoffice/trunk/main/cpputools/Executable_sp2bv.mk
openoffice/trunk/main/solenv/inc/unxmacc.mk
openoffice/trunk/main/solenv/inc/unxmacx.mk
Modified: openoffice/trunk/main/cpputools/Executable_regsingleton.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_regsingleton.mk?rev=1851296&r1=1851295&r2=1851296&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_regsingleton.mk (original)
+++ openoffice/trunk/main/cpputools/Executable_regsingleton.mk Mon Jan 14 21:24:02 2019
@@ -31,6 +31,12 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Executable_add_ldflags,regsingleton,\
+ -dynamiclib -headerpad_max_install_names \
+))
+endif
+
$(eval $(call gb_Executable_set_private_extract_of_public_api,regsingleton,$(OUTDIR)/bin/udkapi.rdb,\
com.sun.star.uno.TypeClass \
com.sun.star.uno.XAggregation \
Modified: openoffice/trunk/main/cpputools/Executable_sp2bv.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cpputools/Executable_sp2bv.mk?rev=1851296&r1=1851295&r2=1851296&view=diff
==============================================================================
--- openoffice/trunk/main/cpputools/Executable_sp2bv.mk (original)
+++ openoffice/trunk/main/cpputools/Executable_sp2bv.mk Mon Jan 14 21:24:02 2019
@@ -29,6 +29,11 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Executable_add_ldflags,sp2bv,\
+ -dynamiclib -headerpad_max_install_names \
+))
+endif
$(eval $(call gb_Executable_add_exception_objects,sp2bv,\
cpputools/source/sp2bv/sp2bv \
))
Modified: openoffice/trunk/main/solenv/inc/unxmacc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacc.mk?rev=1851296&r1=1851295&r2=1851296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacc.mk Mon Jan 14 21:24:02 2019
@@ -167,7 +167,7 @@ LINK*=$(CXX)
LINKC*=$(CC)
###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
-EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad,ff
+EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad_max_install_names
LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)'
Modified: openoffice/trunk/main/solenv/inc/unxmacx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacx.mk?rev=1851296&r1=1851295&r2=1851296&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacx.mk Mon Jan 14 21:24:02 2019
@@ -186,7 +186,7 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/l
LINK*=$(CXX)
LINKC*=$(CC)
-LINKFLAGSDEFS*=-Wl,-headerpad,ff,-multiply_defined,suppress
+LINKFLAGSDEFS*=-Wl,-headerpad_max_install_names,-multiply_defined,suppress
# assure backwards-compatibility
EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)'