diff options
19 files changed, 19 insertions, 134 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dee5effffc64..9957de8af6b4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -911,12 +911,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ rdf \ ) -ifeq ($(OS),MACOSX) - -$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.$(RASQAL_MAJOR) libraptor2-lo.$(RAPTOR_MAJOR),-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) - -endif - endef else # ANDROID @@ -2242,7 +2236,6 @@ $(call gb_LinkTarget_add_libs,$(1),\ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ - -dylib_file @loader_path/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \ ) else diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 70b5083e00b3..65356722fedb 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -58,8 +58,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ - LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ - $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl$(COMMA)-dylib_file$(COMMA)@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ + LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \ && $(MAKE) \ ) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a65f6f6d7938..ffd276548244 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -82,7 +82,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 34b6834c35fb..a681e1b88dd7 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -115,7 +115,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif @@ -183,7 +183,7 @@ ifeq "$(OS)" "WIN" $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile index af9e58baa7c9..df8d6f95e3a2 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile @@ -90,7 +90,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile index c63e960945f9..8fd95e44d65b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile @@ -84,7 +84,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile index f3e780108443..61c384a488cd 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile @@ -81,7 +81,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile index bb1dfc20308a..2e7f904f6f96 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile @@ -78,7 +78,7 @@ ifeq "$(OS)" "WIN" $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile index 504f229c56f5..31c934fce729 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile @@ -84,7 +84,7 @@ ifeq "$(OS)" "WIN" $(OBJFILES) $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $(OBJFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile index 33f4c2dfa785..de0d09b675e7 100644 --- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile +++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile @@ -71,7 +71,7 @@ ifeq "$(OS)" "WIN" $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/cpp/DocumentLoader/Makefile b/odk/examples/cpp/DocumentLoader/Makefile index 488926254d59..2b6ebe795f44 100644 --- a/odk/examples/cpp/DocumentLoader/Makefile +++ b/odk/examples/cpp/DocumentLoader/Makefile @@ -73,7 +73,7 @@ ifeq "$(OS)" "WIN" $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) else $(LINK) $(EXE_LINK_FLAGS) $(LINK_LIBS) -o $@ $< \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALHELPERDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) $(STDC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS_BIN) $@ endif diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index d10acd5ebb4b..98541eb3d489 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -90,7 +90,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/cpp/counter/Makefile b/odk/examples/cpp/counter/Makefile index e74b472256b2..930eea0a0129 100644 --- a/odk/examples/cpp/counter/Makefile +++ b/odk/examples/cpp/counter/Makefile @@ -117,7 +117,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/cpp/remoteclient/Makefile b/odk/examples/cpp/remoteclient/Makefile index 97b0c3f903f9..96c490195d41 100644 --- a/odk/examples/cpp/remoteclient/Makefile +++ b/odk/examples/cpp/remoteclient/Makefile @@ -90,7 +90,7 @@ else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 2a24e8b7fc70..0bae9b697fb9 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -436,13 +436,6 @@ SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore -SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib' -CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib' -CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib' -SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib' -REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib' -STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib' - INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -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 diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 10ff5f3ef5f1..0082bd7f304b 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -46,8 +46,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ - $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ - $(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index c35a5bfb1d82..bc47c3cd34e2 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -49,9 +49,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ LDFLAGS="-L$(OUTDIR)/lib \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \ - $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \ - $(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.$(RAPTOR_MAJOR).dylib:$(OUTDIR)/lib/libraptor-lo.$(RAPTOR_MAJOR).dylib \ - $(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \ + $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl deleted file mode 100644 index 97458e431523..000000000000 --- a/solenv/bin/macosx-dylib-link-list.pl +++ /dev/null @@ -1,84 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -use lib ("$ENV{SOLARENV}/bin/modules"); -use macosxotoolhelper; - -sub locate($) -{ - my ($lib) = @_; - my $dir; - foreach $dir (@dirs) - { - my $path = "$dir/$lib"; - if (-e $path) - { - return $path; - } - } - return; -} - -sub handle($$) -{ - my ($from, $to) = @_; - # wrap -dylib_file in -Wl so that hopefully any used tool whatsoever (e.g., - # libtool generated from xmlsec1-1.2.6/configure included in - # libxmlsec/download/xmlsec1-1.2.6.tar.gz:1.3) passes it through to the - # linker: - !($from =~ /,/ || $to =~ /,/) or - die "$from:$to contains commas and cannot go into -Wl"; - print " -Wl,-dylib_file,$from:$to"; - $done{$from} = 1; - push(@todo, $to) if (grep {$_ eq $to} @todo) == 0; -} - -foreach (@ARGV) { push(@dirs, $1) if /^-L(.*)$/; } -foreach (@ARGV) -{ - if (/^-l(.*)$/) - { - my $loc = locate("lib$1.dylib"); - handle($1, $loc) if defined $loc && otoolD($loc) =~ m'^(@.+/.+)\n$'; - } -} -foreach $file (@todo) -{ - my $call = "otool -L $file"; - open(IN, "-|", $call) or die "cannot $call"; - while (<IN>) - { - if (m'^\s*(@.+/([^/]+)) \(compatibility version \d+\.\d+\.\d+, current version \d+\.\d+\.\d+\)\n$') - { - my $full = $1; - my $loc = locate($2); - # mapping for PythonFramework in RepositoryExternal.mk - next if $full =~ m'^\s*@loader_path/(LibreOfficePython.framework/Versions/[^/]+/LibreOfficePython)'; - if (defined $loc) - { - handle($full, $loc) unless defined $done{$full}; - } - else - { - die "unknown $full (from $file)"; - } - } - } - close(IN); -} -print "\n"; diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index c6717b0cbdb0..31ad5c0d41b1 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -133,20 +133,9 @@ $(if $(filter Executable,$(1)),\ $$(call gb_Library_get_layer,$(2))) endef -# FIXME the DYLIB_FILE mess is only necessary because -# solver layout is different from installation layout define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ - DYLIB_FILE=`$(gb_MKTEMP)` && \ - $(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \ - $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ - $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \ - $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ - $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(subst \d,$$,$(RPATH)) \ - $(T_LDFLAGS) \ - $(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \ $(gb_CXX) \ $(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \ $(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \ @@ -163,21 +152,19 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \ - `cat $${DYLIB_FILE}` \ $(LIBS) \ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \ -o $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ $(if $(SOVERSION),ln -sf $(notdir $(1)).$(SOVERSION) $(1),:) && \ - $(if $(filter Executable,$(TARGETTYPE)), \ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app \ - $(LAYER) $(1) &&) \ + $(if $(filter Executable,$(TARGETTYPE)), \ + $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \ ln -sf $(notdir $(1)) $(basename $(1)).jnilib &&) \ $(if $(MACOSX_CODESIGNING_IDENTITY), \ $(if $(filter Executable,$(TARGETTYPE)), \ codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) $(1) &&)) \ - rm -f $${DYLIB_FILE}) + :) endef # parameters: 1-linktarget 2-cobjects 3-cxxobjects |