strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/sal/Library_sal.mk
Stephan Bergmann 494bdd3dc3 Support for tcmalloc and jemalloc is long dead 
When it was originally added to --with-alloc (tcmalloc:
f63ffaf366,
54efc5ed83,
0abd71b441
708b6d4246 "INTEGRATION: CWS configure14: #i59160#
allow usage of tcmalloc and system-malloc"; jemalloc:
826a90d68a "configure25: #i111045# jemalloc"), the
old build system's solenv/inc/unxlng*.mk added corresponding -l switches to
linker command lines, but it appears that was never carried over into the new
build system.

And even if the AC_CHECL_LIB calls in configure.ac prior to
e612f026de "Ensure AC_CHECK_LIB/AC_SEARCH_LIBS do
not poison LIBS" would have extended LIBS with the correpsonding -l switches,
there appears to be no mechanism in the new build system that would have
depended on letting that have any effect on which alloc lib to link against.

So the only remaining effect of --with-alloc={tcmalloc,jemalloc} is to set
FORCE_SYSALLOC in Library_sal.mk, same as --with-alloc=system does.  So whoever
still uses the former configure switches should just switch to the latter.

(Also adapt the documentation of --with-alloc to reality, "internal" instead of
"oo".)

Change-Id: Iac0e302c5f9602daf5f8452a0fc1887dc55ee27b
Reviewed-on: https://gerrit.libreoffice.org/47178
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-12-30 11:34:26 +01:00

258 lines
5.6 KiB
Makefile
Raw Blame History

# -*- 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_Library_Library,sal))
$(eval $(call gb_Library_set_soversion_script,sal,$(SRCDIR)/sal/util/sal.map))
$(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal))
$(eval $(call gb_Library_set_include,sal,\
$$(INCLUDE) \
-I$(SRCDIR)/sal/inc \
))
$(eval $(call gb_Library_add_defs,sal,\
$(if $(filter $(BUILD_TYPE),FUZZERS), \
-DFORCE_DEFAULT_SIGNAL \
) \
$(if $(filter $(ALLOC),SYS_ALLOC)$(filter-out X$(ENABLE_RUNTIME_OPTIMIZATIONS),XTRUE), \
-DFORCE_SYSALLOC \
) \
$(if $(filter $(OS),IOS), \
-DNO_CHILD_PROCESSES \
) \
-DSAL_DLLIMPLEMENTATION \
-DRTL_OS="\"$(RTL_OS)\"" \
-DRTL_ARCH="\"$(RTL_ARCH)\"" \
-DSRCDIR="\"$(SRCDIR)\"" \
))
$(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
) \
))
$(eval $(call gb_Library_use_externals,sal,\
valgrind \
))
$(eval $(call gb_Library_use_system_win32_libs,sal,\
advapi32 \
comdlg32 \
dbghelp \
mpr \
ole32 \
shell32 \
user32 \
ws2_32 \
))
$(eval $(call gb_Library_add_libs,sal,\
$(if $(filter-out $(OS),WNT), \
$(if $(filter $(OS),ANDROID),, \
-lpthread \
) \
) \
$(if $(filter $(OS),LINUX), \
-ldl \
-lrt \
) \
$(if $(filter $(OS),SOLARIS), \
-lnsl \
-lsocket \
) \
))
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
Carbon \
CoreFoundation \
Foundation \
$(if $(ENABLE_MACOSX_SANDBOX),Security) \
))
endif
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/all/compat \
sal/osl/all/debugbase \
sal/osl/all/filepath \
sal/osl/all/loadmodulerelative \
sal/osl/all/log \
sal/osl/all/signalshared \
sal/osl/all/utility \
sal/rtl/alloc_arena \
sal/rtl/alloc_cache \
sal/rtl/alloc_fini \
sal/rtl/alloc_global \
sal/rtl/bootstrap \
sal/rtl/byteseq \
sal/rtl/cipher \
sal/rtl/cmdargs \
sal/rtl/crc \
sal/rtl/digest \
sal/rtl/hash \
sal/rtl/locale \
sal/rtl/math \
sal/rtl/random \
sal/rtl/rtl_process \
sal/rtl/strbuf \
sal/rtl/strimp \
sal/rtl/string \
sal/rtl/unload \
sal/rtl/uri \
sal/rtl/ustrbuf \
sal/rtl/ustring \
sal/rtl/uuid \
sal/textenc/converter \
sal/textenc/convertsimple \
sal/textenc/handleundefinedunicodetotextchar \
sal/textenc/tcvtutf8 \
sal/textenc/tencinfo \
sal/textenc/textcvt \
sal/textenc/textenc \
sal/textenc/unichars \
))
ifeq ($(OS),IOS)
$(eval $(call gb_Library_add_cxxflags,sal,\
$(gb_OBJCXXFLAGS) \
))
endif
sal_textenc_code= \
sal/textenc/context \
sal/textenc/convertbig5hkscs \
sal/textenc/converteuctw \
sal/textenc/convertgb18030 \
sal/textenc/convertisciidevangari \
sal/textenc/convertiso2022cn \
sal/textenc/convertiso2022jp \
sal/textenc/convertiso2022kr \
sal/textenc/convertsinglebytetobmpunicode \
sal/textenc/tables \
sal/textenc/tcvtbyte \
sal/textenc/tcvtmb \
sal/textenc/tcvtutf7 \
ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_exception_objects,sal,\
$(sal_textenc_code) \
))
else ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Library_add_exception_objects,sal,\
$(sal_textenc_code) \
))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/backtraceapi \
sal/osl/unx/conditn \
sal/osl/unx/file \
sal/osl/unx/file_error_transl \
sal/osl/unx/file_misc \
sal/osl/unx/file_path_helper \
sal/osl/unx/file_stat \
sal/osl/unx/file_url \
sal/osl/unx/file_volume \
sal/osl/unx/memory \
sal/osl/unx/module \
sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
sal/osl/unx/pipe \
sal/osl/unx/process \
sal/osl/unx/process_impl \
sal/osl/unx/profile \
sal/osl/unx/random \
sal/osl/unx/readwrite_helper \
sal/osl/unx/security \
sal/osl/unx/signal \
sal/osl/unx/socket \
sal/osl/unx/system \
sal/osl/unx/tempfile \
sal/osl/unx/thread \
sal/osl/unx/time \
$(if $(filter-out ANDROID IOS,$(OS)), sal/osl/unx/salinit) \
))
# Note that the uunxapi.mm file just includes the uunxapi.cxx one
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_objcxxobjects,sal,\
sal/osl/unx/uunxapi \
))
else
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/uunxapi \
))
endif
ifneq ($(filter $(OS),MACOSX IOS),)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/osxlocale \
))
endif
ifneq ($(OS),WNT)
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/backtrace \
))
endif
ifneq ($(filter $(CPUNAME),SPARC64 SPARC),)
$(eval $(call gb_Library_add_asmobjects,sal,\
sal/osl/unx/asm/interlck_sparc \
))
else
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/interlck \
))
endif
else # $(OS) == WNT
# FIXME ?
# .IF "$(CCNUMVER)" >= "001400000000"
# $(eval $(call gb_Library_add_defs,sal,\
-D_CRT_NON_CONFORMING_SWPRINTFS \
))
# .ENDIF
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/w32/backtrace \
sal/osl/w32/conditn \
sal/osl/w32/dllentry \
sal/osl/w32/file \
sal/osl/w32/file_dirvol \
sal/osl/w32/file_error \
sal/osl/w32/file_url \
sal/osl/w32/interlck \
sal/osl/w32/memory \
sal/osl/w32/module \
sal/osl/w32/mutex \
sal/osl/w32/nlsupport \
sal/osl/w32/path_helper \
sal/osl/w32/pipe \
sal/osl/w32/process \
sal/osl/w32/procimpl \
sal/osl/w32/profile \
sal/osl/w32/random \
sal/osl/w32/salinit \
sal/osl/w32/security \
sal/osl/w32/signal \
sal/osl/w32/socket \
sal/osl/w32/tempfile \
sal/osl/w32/thread \
sal/osl/w32/time \
))
endif # ifneq ($(OS),WNT)
# vim: set noet sw=4 ts=4:
Reference in a new issue View git blame Copy permalink