forked from amazingfate/loongoffice
d257209a54
This reverts commit 9ff0ee4905068cbc85acf85da1b3ef762b324ed7. Whatever the gold warnings are exactly, this is apparently not the right fix. The change to openssl/ExternalProject_openssl.mk caused crashes when LO's libneon.so, statically linking in LO's libssl.a, started to export symbols like SSLv23_client_method as global, competing with the same symbol from a system's libssl.so. See the mail thread starting at <http://lists.freedesktop.org/archives/libreoffice/2013-June/053119.html> "strange crash in SSL code while opening some documents." Whether the change to expat/StaticLibrary_expat.mk caused similar problems is not clear to me, but it is probably best to revert both to be on the save side, and see what exactly the gold warning was about and how to fix it the right way if it ever shows up again.
57 lines
1.4 KiB
Makefile
57 lines
1.4 KiB
Makefile
# -*- 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_StaticLibrary_StaticLibrary,expat))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_unpacked,expat,expat))
|
|
|
|
# no configure step on windows, no dependency
|
|
ifneq ($(OS)$(COM),WNTMSC)
|
|
$(eval $(call gb_StaticLibrary_use_external_project,expat,expat))
|
|
endif
|
|
|
|
$(eval $(call gb_StaticLibrary_set_include,expat,\
|
|
-I$(call gb_UnpackedTarball_get_dir,expat) \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
ifneq ($(strip $(SYSBASE)),)
|
|
$(eval $(call gb_StaticLibrary_add_defs,expat,\
|
|
-DHAVE_MEMMOVE \
|
|
-DHAVE_BCOPY \
|
|
))
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_StaticLibrary_add_defs,expat,\
|
|
-DCOMPILED_FROM_DSP \
|
|
))
|
|
else
|
|
$(eval $(call gb_StaticLibrary_add_defs,expat,\
|
|
-DHAVE_EXPAT_CONFIG_H \
|
|
))
|
|
endif
|
|
|
|
# suppress warning spam
|
|
$(eval $(call gb_StaticLibrary_add_cflags,expat,\
|
|
-w \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
|
|
UnpackedTarball/expat/lib/xmlparse \
|
|
UnpackedTarball/expat/lib/xmlrole \
|
|
UnpackedTarball/expat/lib/xmltok \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|