cppu/prj/d.lst | 4 +- cppu/util/makefile.mk | 2 - cppuhelper/source/makefile.mk | 4 +- desktop/source/deployment/misc/dp_platform.cxx | 2 - mysqlc/source/makefile.mk | 2 - odk/setsdkenv_unix.sh.in | 39 +++++++++++++++++-------- odk/settings/settings.mk | 16 +++++----- sal/inc/osl/module.h | 2 - sal/prj/d.lst | 3 - sal/util/makefile.mk | 2 + salhelper/source/makefile.mk | 2 - scp2/inc/macros.inc | 2 + scp2/source/ooo/ure.scp | 36 +++++++++++++++++++++++ solenv/bin/macosx-change-install-names.pl | 4 +- solenv/gbuild/platform/macosx.mk | 20 +----------- solenv/inc/unxmacc.mk | 10 ++---- solenv/inc/unxmacx.mk | 10 ++---- store/util/makefile.mk | 2 + vcl/win/source/src/assw.cur |binary 19 files changed, 101 insertions(+), 61 deletions(-)
New commits: commit 1170f10906a9bca78782df6ab1b6a4e20cf0435a Author: Matthias Seidel <[email protected]> AuthorDate: Fri Jan 11 22:52:36 2019 +0000 Commit: Matthias Seidel <[email protected]> CommitDate: Fri Jan 11 22:52:36 2019 +0000 Corrected hotspot for pointer (autoscroll south west) diff --git a/vcl/win/source/src/assw.cur b/vcl/win/source/src/assw.cur index fddaf3f57cbf..46ee06d16849 100644 Binary files a/vcl/win/source/src/assw.cur and b/vcl/win/source/src/assw.cur differ commit c50f8b48d9c8ffac93ce8ba682bb7102d2d173f6 Author: Jim Jagielski <[email protected]> AuthorDate: Fri Jan 11 21:44:17 2019 +0000 Commit: Jim Jagielski <[email protected]> CommitDate: Fri Jan 11 21:44:17 2019 +0000 Get macOS building and packaging again. Following changes/fixes: o Stop pretending/forcing *Nix shared lib versioning on macOS o Use smaller and more easily manageable temp temps by leveraging --headerpad dyld option o misc gbuild fixes diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index 6775c0353218..13d0d15f50c4 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -57,10 +57,12 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\cppu*.lib %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libuno_cppu.dylib %_DEST%\lib%_EXT%\libuno_cppu.dylib ..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\libuno_purpenvhelper*.dylib %_DEST%\lib%_EXT%\* ..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\* @@ -72,4 +74,4 @@ mkdir: %_DEST%\inc%_EXT%\uno ..\%__SRC%\lib\liblog_uno_uno.* %_DEST%\lib%_EXT%\* linklib: libuno_cppu.*.* -linklib: libuno_purpenvhelper*.*.* +linklib: libuno_purpenvhelper*.*.* \ No newline at end of file diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 46ee6ab0650c..26937bbc69d0 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -28,7 +28,7 @@ USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE -.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" +.IF "$(OS)" != "WNT" && "$(OS)" != "OS2" && "$(OS)" != "MACOSX" UNIXVERSIONNAMES=UDK .ENDIF diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk index 325201006fe3..68d7413b064a 100644 --- a/cppuhelper/source/makefile.mk +++ b/cppuhelper/source/makefile.mk @@ -34,9 +34,9 @@ VISIBILITY_HIDDEN=TRUE # without "-L" (light) switch BOOTSTRAP_SERVICE=TRUE -.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" +.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" && "$(OS)" != "MACOSX" UNIXVERSIONNAMES=UDK -.ENDIF # WNT +.ENDIF # WNT OS2 MACOSX # --- Settings ----------------------------------------------------- diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 9259981c6f53..2c2c15d2bc3e 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -180,7 +180,7 @@ namespace else if (token.equals(OUSTR(PLATFORM_MACOSX_X86))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86")); else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64))) - ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("X86_64")); + ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64")); else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_OS2_X86))) diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 35d8fde775a4..0e29eea1ab11 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -285,7 +285,7 @@ $(COMPONENT_MYSQL_LIBFILE): $(MYSQL_LIBFILE) @@-$(MKDIRHIER) $(@:d) @$(COPY) $< $@ > $(NULLDEV) .IF "$(OS)" == "MACOSX" - install_name_tool -id @__________________________________________________OOO/$(MYSQL_LIBFILE:f) $@ + install_name_tool -id @_______OOO/$(MYSQL_LIBFILE:f) $@ .ENDIF .ENDIF diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 5a7fa6382f64..d361b7319a1d 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -282,28 +282,43 @@ then # Only necessary on MacOSX, on other Unix systems the links are already prepared # in the SDK installation. -# cleanup potential old links first - rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" - # prepare links if [ "${OFFICE_HOME}" ] then mkdir -p "${OO_SDK_OUT}/${directoryname}/lib" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \ + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \ + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \ + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" - ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}.3" + + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}" \ + "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}" \ + "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}" \ + "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}" \ + "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" + ln -shf "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}" \ + "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" + fi fi diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index f22d2d1eedb2..fee694d34e7a 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -443,16 +443,16 @@ SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib' -CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib' -CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' -SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib' -REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' -STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib' +SALDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_sal.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib' +CPPUDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_cppu.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib' +CPPUHELPERDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_cppuhelper'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' +SALHELPERDYLIB=-Wl,-dylib_file,@_______URELIB/libuno_salhelper$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib' +REGDYLIB=-Wl,-dylib_file,@_______URELIB/libreg.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib' +STOREDYLIB=-Wl,-dylib_file,@_______URELIB/libstore.dylib:'$(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=$(INSTALLTOOL) -change @_______URELIB/libuno_sal.dylib @executable_path/libuno_sal.dylib -change @_______URELIB/libuno_cppu.dylib @executable_path/libuno_cppu.dylib -change @_______URELIB/libuno_cppuhelper$(COMID).dylib @executable_path/libuno_cppuhelper$(COMID).dylib -change @_______URELIB/libuno_salhelper$(COMID).dylib @executable_path/libuno_salhelper$(COMID).dylib -change @_______URELIB/libreg.dylib @executable_path/libreg.dylib -change @_______URELIB/libstore.dylib @executable_path/libstore.dylib -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 +INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change @_______URELIB/libuno_sal.dylib libuno_sal.dylib -change @_______URELIB/libuno_cppu.dylib libuno_cppu.dylib -change @_______URELIB/libuno_cppuhelper$(COMID).dylib libuno_cppuhelper$(COMID).dylib -change @_______URELIB/libuno_salhelper$(COMID).dylib libuno_salhelper$(COMID).dylib -change @_______URELIB/libreg.dylib libreg.dylib -change @_______URELIB/libstore.dylib libstore.dylib EMPTYSTRING= PATH_SEPARATOR=: diff --git a/sal/inc/osl/module.h b/sal/inc/osl/module.h index 299125ed3f82..617bd82d5062 100644 --- a/sal/inc/osl/module.h +++ b/sal/inc/osl/module.h @@ -44,7 +44,7 @@ extern "C" { #elif defined(SAL_UNX) #if defined(MACOSX) -#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib." version +#define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name ".dylib" #else #define SAL_MODULENAME_WITH_VERSION(name, version) SAL_DLLPREFIX name SAL_DLLEXTENSION "." version #endif diff --git a/sal/prj/d.lst b/sal/prj/d.lst index 0a22cda9676d..776f13b2765d 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -18,8 +18,7 @@ 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_sal.dylib %_DEST%\lib%_EXT%\libuno_sal.dylib ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk index bb1601882453..92575366ef80 100644 --- a/sal/util/makefile.mk +++ b/sal/util/makefile.mk @@ -36,7 +36,9 @@ USE_DEFFILE=TRUE TARGETTYPE=CUI .ENDIF # UNX +.IF "$(OS)" != "MACOSX" UNIXVERSIONNAMES=UDK +.ENDIF # --- Settings ----------------------------------------------------- diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk index 2f9ed8485e98..9c6f9ffb51bf 100644 --- a/salhelper/source/makefile.mk +++ b/salhelper/source/makefile.mk @@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE USE_DEFFILE=TRUE -.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" +.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" && "$(OS)" != "MACOSX" UNIXVERSIONNAMES=UDK .ENDIF # WNT diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 467dee59034c..8149cd7975dc 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -548,6 +548,8 @@ End #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_COMID_VER(n, v) \ "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v +#define SCP2_URE_DL_COMID_NORMAL(n) \ + "lib" n STRING(COMID) STRING(UNXSUFFIX) #define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX) #define SCP2_URE_DL_UNO_COMID_VER(n, v) \ diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a4399d63f6b5..30f0599e02d7 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -190,7 +190,11 @@ End File gid_File_Dl_Cppu TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined MACOSX + Name = SCP2_URE_DL_UNO_NORMAL("cppu"); +#else Name = SCP2_URE_DL_UNO_VER("cppu", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -200,8 +204,12 @@ File gid_File_Dl_Cppuhelper #ifdef OS2 Name = "cppuh3.dll"; #else +#if defined MACOSX + Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper"); +#else Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); #endif +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -211,15 +219,23 @@ File gid_File_Dl_PurpEnvHelper #ifdef OS2 Name = "purpeh3.dll"; #else +#if defined MACOSX + Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper"); +#else Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3"); #endif +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End File gid_File_Dl_Sal TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined MACOSX + Name = SCP2_URE_DL_UNO_NORMAL("sal"); +#else Name = SCP2_URE_DL_UNO_VER("sal", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -229,8 +245,12 @@ File gid_File_Dl_Salhelper #ifdef OS2 Name = "salhelp3.dll"; #else +#if defined MACOSX + Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper"); +#else Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3"); #endif +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -239,14 +259,22 @@ End File gid_File_Dl_Reg TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined MACOSX + Name = SCP2_URE_DL_NORMAL("reg"); +#else Name = SCP2_URE_DL_VER("reg", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End File gid_File_Dl_Store TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined MACOSX + Name = SCP2_URE_DL_NORMAL("store"); +#else Name = SCP2_URE_DL_VER("store", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End @@ -267,15 +295,23 @@ File gid_File_Dl_Jvmaccess #ifdef OS2 Name = "jvmacces.dll"; #else +#if defined MACOSX + Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess"); +#else Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3"); #endif +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End File gid_File_Dl_Jvmfwk TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; +#if defined MACOSX + Name = SCP2_URE_DL_NORMAL("jvmfwk"); +#else Name = SCP2_URE_DL_VER("jvmfwk", "3"); +#endif Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index dd661d9829ef..ba4a60a91c1e 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -114,7 +114,7 @@ if ($type eq "extshl") { foreach $file (@ARGV) { - my $call = "${::CC_PATH}install_name_tool$change -id \@__________________________________________________$loc/$inames{$file} $file"; + my $call = "${::CC_PATH}install_name_tool$change -id \@_______$loc/$inames{$file} $file"; system($call) == 0 or die "cannot $call"; } } @@ -127,7 +127,7 @@ foreach $file (@ARGV) while (<IN>) { $change .= " -change $1 " . action($type, $loc, $2) . "$3" - if m'^\s*(@_{50}([^/]+)(/.+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$'; + if m'^\s*(@_{7}([^/]+)(/.+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$'; } close(IN); if ($change ne "") diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 84d84198b971..cfb7f7c15b1b 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -257,9 +257,9 @@ $(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget__RPATHS))) endef gb_LinkTarget__RPATHS := \ - URELIB:@__________________________________________________URELIB/ \ + URELIB:@_______URELIB/ \ UREBIN: \ - OOO:@__________________________________________________OOO/ \ + OOO:@_______OOO/ \ BRAND: \ SDKBIN: \ NONEBIN: \ @@ -318,18 +318,10 @@ $(call gb_Helper_abbreviate_dirs,\ `cat $${DYLIB_FILE}` && \ $(if $(filter Library,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \ - ln -f $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ + ln -shf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \ 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) && \ - mv $(1) $(1).$(gb_UDK_MAJOR) && \ - ln -shf $(1).$(gb_UDK_MAJOR) $(1))) -endef - # parameters: 1-linktarget 2-cobjects 3-cxxobjects define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ @@ -345,7 +337,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 @@ -402,11 +393,6 @@ 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 $(call gb_Library_get_target,$(1)) \ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \ $(patsubst %.dylib,%.jnilib,$(call gb_Library_get_target,$(1))) diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk index 523dba9b5578..8150c5c0819e 100644 --- a/solenv/inc/unxmacc.mk +++ b/solenv/inc/unxmacc.mk @@ -167,17 +167,15 @@ LINK*=$(CXX) LINKC*=$(CC) ###LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress -EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -# Very long install_names are needed so that install_name_tool -change later on -# does not complain that "larger updated load commands do not fit:" -LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' +EXTRA_LINKFLAGS*=-L$(MACOSX_SDK_PATH) -Wl,-headerpad,ff +LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)' LINKFLAGSRUNPATH_UREBIN= -LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)' +LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)' LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_BRAND= LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT= -LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)' +LINKFLAGSRUNPATH_NONE=-install_name '@_______NONE/$(@:f)' LINKFLAGS=$(LINKFLAGSDEFS) LINKFLAGS+=-lobjc diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 46c5252d809a..ec23c4349405 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -186,19 +186,17 @@ LIBSTLPORTST=$(SOLARVERSION)/$(INPATH)/lib/libstlport_gcc.a LINK*=$(CXX) LINKC*=$(CC) -LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress +LINKFLAGSDEFS*=-Wl,-headerpad,ff,-multiply_defined,suppress # assure backwards-compatibility EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -# Very long install_names are needed so that install_name_tool -change later on -# does not complain that "larger updated load commands do not fit:" -LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' +LINKFLAGSRUNPATH_URELIB=-install_name '@_______URELIB/$(@:f)' LINKFLAGSRUNPATH_UREBIN= -LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)' +LINKFLAGSRUNPATH_OOO=-install_name '@_______OOO/$(@:f)' LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_BRAND= LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_BOXT= -LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)' +LINKFLAGSRUNPATH_NONE=-install_name '@_______NONE/$(@:f)' LINKFLAGS=$(LINKFLAGSDEFS) # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line diff --git a/store/util/makefile.mk b/store/util/makefile.mk index eefe6dcf08ad..5484607c84d5 100644 --- a/store/util/makefile.mk +++ b/store/util/makefile.mk @@ -33,7 +33,9 @@ USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE NO_DEFAULT_STL=TRUE +.IF "$(OS)" != "MACOSX" UNIXVERSIONNAMES=UDK +.ENDIF # --- Settings --- _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
