[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc
Jim Jagielski
jim at apache.org
Thu Jul 12 18:09:38 UTC 2018
desktop/source/pagein/makefile.mk | 5 +++++
odk/setsdkenv_unix.sh.in | 10 +++++-----
odk/settings/settings.mk | 34 +++++++++++++++++-----------------
sal/prj/d.lst | 4 ++--
solenv/gbuild/platform/macosx.mk | 6 ++----
solenv/inc/libs.mk | 13 ++++++++-----
6 files changed, 39 insertions(+), 33 deletions(-)
New commits:
commit bb86fdd2cef9abc011e398dd4a4be17f3d332641
Author: Jim Jagielski <jim at apache.org>
Date: Thu Jul 12 17:25:33 2018 +0000
Work on getting macOS building again w/ 4.2.0 and the versioning of libs...
what a cluster*
diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk
index fdf2988001fa..e4588785cd6a 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,8 +63,13 @@ ALL: \
.INCLUDE : target.mk
ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
+.IF "$(OS)" == "MACOSX"
+UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
+UNODLLPOST=.uno$(DLLPOST)
+.ELSE
UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
UNODLLPOST=.uno$(DLLPOST)
+.ENDIF
DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 5a7fa6382f64..7b3a39874ef0 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index f22d2d1eedb2..276fa3091b2a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-luno_sal
-CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-SALHELPERLIB=-luno_salhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
-
-SALDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/libstore.dylib.3
-
-INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3
+SALLIB=-luno_sal3
+CPPULIB=-luno_cppu3
+CPPUHELPERLIB=-luno_cppuhelper3$(COMID)
+SALHELPERLIB=-luno_salhelper3$(COMID)
+REGLIB=-lreg3
+STORELIB=-lstore3
+
+SALDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
+CPPUDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
+CPPUHELPERDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
+SALHELPERDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
+REGDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
+STOREDYLIB=-Wl,-dylib_file, at __________________________________________________URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
+
+INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno3_sal.dylib @executable_path/libuno_sal3.dylib -change @__________________________________________________URELIB/libuno_cppu3.dylib @executable_path/libuno_cppu3.dylib -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib @executable_path/libuno_cppuhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib @executable_path/libuno_salhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libreg3.dylib @executable_path/libreg3.dylib -change @__________________________________________________URELIB/libstore3.dylib @executable_path/libstore3.dylib
+
+INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @__________________________________________________URELIB/libuno_sal3.dylib libuno_sal3.dylib -change @__________________________________________________URELIB/libuno_cppu3.dylib libuno_cppu3.dylib -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID)3.dylib libuno_cppuhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libuno_salhelper$(COMID)3.dylib libuno_salhelper$(COMID)3.dylib -change @__________________________________________________URELIB/libreg3.dylib libreg3.dylib -change @__________________________________________________URELIB/libstore3.dylib libstore3.dylib
EMPTYSTRING=
PATH_SEPARATOR=:
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 0a22cda9676d..404ce2337609 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -18,8 +18,8 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32
symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so
..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3
symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
-..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
-symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
+..\%__SRC%\lib\libuno_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal3.dylib
+symlink: %_DEST%\lib%_EXT%\libuno_sal3.dylib %_DEST%\lib%_EXT%\libuno_sal.dylib
..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 463cba4a513d..2f237f54d99a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -294,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 $(1) \
+ -o $(if $(call gb_Library_is_udk_versioned,$(1)),$(patsubst %.dylib,%$(gb_UDK_MAJOR).dylib,$(1)),$(1)) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
@@ -305,9 +305,7 @@ 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) ))
+ rm -f $(1) && ln -s $(patsubst %.dylib,%$(gb_UDK_MAJOR).dylib,$(notdir $(1))) $(1)))
endef
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 153e2eabd3e5..e90eea9dd8b0 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -21,7 +21,7 @@
LIBSMKREV!:="$$Revision$$"
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC" || "$(OS)"=="MACOSX")
#
#externe libs in plattform.mk
@@ -98,7 +98,7 @@ OPENSSLLIBST=-lssl_static -lcrypto_static
OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.ENDIF # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
REGLIB=-lreg$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
REGLIB=-lreg
@@ -109,6 +109,9 @@ XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
STORELIB=-lstore$(UDK_MAJOR)
SALLIB=-lsal$(UDK_MAJOR)
+.ELIF "$(OS)"=="MACOSX"
+STORELIB=-lstore$(UDK_MAJOR)
+SALLIB=-luno_sal$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
STORELIB=-lstore
SALLIB=-luno_sal
@@ -117,7 +120,7 @@ SALLIB=-luno_sal
ODBCLIB=-lodbc$(DLLPOSTFIX)
ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
RMCXTLIB=-lrmcxt$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
RMCXTLIB=-lrmcxt
@@ -270,7 +273,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
ISDLIB=-lsd$(DLLPOSTFIX)
PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(COMID)
@@ -283,7 +286,7 @@ XSLTLIB=$(LIBXSLT_LIBS)
.ELSE
XSLTLIB=-lxslt $(LIBXML2LIB)
.ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2" || "$(OS)"=="MACOSX"
JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMFWKLIB = -ljvmfwk
More information about the Libreoffice-commits
mailing list