diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-12-09 21:42:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-12-12 09:16:34 +0000 |
| commit | cfd2691e5bf398304d7816227b933e53907b6204 (patch) | |
| tree | bad8841e992dddc11a318cfa0b0d574570e739d9 /odk | |
| parent | d6f2dd831a37ce214c05ed558c4fef2b76b9b121 (diff) | |
[API CHANGE] Remove salcpprt static library
...containing replacements for global operator new/delete (that can be linked
into executables), but which is no longer used. The mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2012-March/028690.html>
"operator new no longer routes through rtl_AllocMemory in libsalcpprt under
gbuild link rules" has the details of how this was used on some platforms (but
not on others) before the switch to gbuild, and has been "lost" ever since---but
apparently a loss not mourned much over the years.
For the SDK, c5f974287fd04bb529de145113133b9e35687702 "INTEGRATION: CWS jsc3:
#i62434# copy libsalcpprt.a" added the library (under Linux) and
6db9c5af960f9787e33e4addc56bddbb1695a402 "INTEGRATION: CWS jsc3: #i62434# extend
link options for executbales to link libsalcpprt.a, LINUX only" added its use to
odk/settings/settings.mk, but fc0ca57f2cd649c6330171445a06b80e2143a0e9
"INTEGRATION: CWS jsc21" removed that use again (for no documented reason). So
this is an incompatible change, but unlikely to actually affect any users of the
SDK.
Change-Id: Ia38b4c439f21fca3f5d9af7d1a34054e992054e9
Reviewed-on: https://gerrit.libreoffice.org/31810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 1 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 1 | ||||
| -rw-r--r-- | odk/Package_lib.mk | 18 |
3 files changed, 0 insertions, 20 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 109a0c924cab..8328fc8a4b0b 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -36,7 +36,6 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ - $(call gb_Package_get_target,odk_lib) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 1dea6578c88f..98dacfc476a8 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -22,7 +22,6 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_docs \ Package_html \ Package_examples \ - Package_lib \ Package_odk_headers \ Package_odk_headers_generated \ Package_settings \ diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk deleted file mode 100644 index 05465c03812f..000000000000 --- a/odk/Package_lib.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_Package_Package,odk_lib,$(WORKDIR)/LinkTarget/StaticLibrary)) - -$(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,odk_lib,$(SDKDIRNAME)/lib,\ - $(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \ -)) - -# vim: set noet sw=4 ts=4: |