Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index 

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3192

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/1

remove -dylib_file mappings that are not needed anymore

XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries
without explicit mapping, but as baseline is now 10.6, this
wrapping is no longer necessary

Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8
---
M RepositoryExternal.mk
M libxmlsec/ExternalProject_xmlsec.mk
M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
M odk/examples/DevelopersGuide/Components/CppComponent/Makefile
M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
M odk/examples/cpp/DocumentLoader/Makefile
M odk/examples/cpp/complextoolbarcontrols/Makefile
M odk/examples/cpp/counter/Makefile
M odk/examples/cpp/remoteclient/Makefile
M odk/settings/settings.mk
M redland/ExternalProject_rasqal.mk
M redland/ExternalProject_redland.mk
D solenv/bin/macosx-dylib-link-list.pl
M solenv/gbuild/platform/macosx.mk
19 files changed, 14 insertions(+), 126 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 295058f..1872c37 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -911,12 +911,6 @@
        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
@@ -2243,7 +2237,6 @@
 )
 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 70b5083..c82c5e2 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -59,7 +59,6 @@
                        $(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"))
 \
                && $(MAKE) \
        )
 
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
index a65f6f6..ffd2765 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile
@@ -82,7 +82,7 @@
 $(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 34b6834..a681e1b 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -115,7 +115,7 @@
 $(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 @@
          $< $(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 af9e58b..df8d6f9 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile
@@ -90,7 +90,7 @@
 $(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 c63e960..8fd95e4 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile
@@ -84,7 +84,7 @@
 $(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 f3e7801..61c384a 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile
@@ -81,7 +81,7 @@
 $(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 bb1dfc2..2e7f904 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile
@@ -78,7 +78,7 @@
          $< $(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 504f229..31c934f 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile
@@ -84,7 +84,7 @@
          $(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 33f4c2d..de0d09b 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
+++ b/odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile
@@ -71,7 +71,7 @@
          $< $(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 4889262..2b6ebe7 100644
--- a/odk/examples/cpp/DocumentLoader/Makefile
+++ b/odk/examples/cpp/DocumentLoader/Makefile
@@ -73,7 +73,7 @@
          $< $(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 d10acd5..98541eb 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -90,7 +90,7 @@
 $(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 e74b472..930eea0 100644
--- a/odk/examples/cpp/counter/Makefile
+++ b/odk/examples/cpp/counter/Makefile
@@ -117,7 +117,7 @@
 $(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 97b0c3f..96c4901 100644
--- a/odk/examples/cpp/remoteclient/Makefile
+++ b/odk/examples/cpp/remoteclient/Makefile
@@ -90,7 +90,7 @@
 $(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 58abdd5..828e393 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -439,13 +439,6 @@
 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 10ff5f3..5132f68 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -47,7 +47,6 @@
                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),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 c35a5bf..43fe4aa 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -50,8 +50,6 @@
                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))"
 \
                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 97458e4..0000000
--- 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 c6717b0..fe335cf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -138,15 +138,6 @@
 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,7 +154,6 @@
                $(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)) && \
@@ -177,7 +167,7 @@
        $(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

-- 
To view, visit https://gerrit.libreoffice.org/3192
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.