d257209a54
This reverts commit 9ff0ee4905. 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.
94 lines
2.9 KiB
Makefile
94 lines
2.9 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_ExternalProject_ExternalProject,openssl))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,openssl,\
|
|
build \
|
|
))
|
|
|
|
# For multi-line conditionals, align the $(if and the corresponding ),
|
|
# putting the latter on a line of its own. Also put the "else" comma
|
|
# on a line of its own. Hopefully should make the logic more clear.
|
|
|
|
OPENSSL_PLATFORM := \
|
|
$(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
|
|
$(if $(filter I,$(CPU)),\
|
|
$(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\
|
|
,\
|
|
$(if $(filter X,$(CPU)),\
|
|
$(if $(filter GNU/kFreeBSD,$(shell uname)),\
|
|
debian-kfreebsd-amd64\
|
|
,\
|
|
$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, linux-generic64)\
|
|
)\
|
|
,\
|
|
$(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, linux-generic32)\
|
|
)\
|
|
)\
|
|
,\
|
|
$(if $(filter SOLARIS,$(OS)),\
|
|
$(if $(filter INTEL,$(CPUNAME)),\
|
|
$(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\
|
|
,\
|
|
solaris-sparcv9-cc\
|
|
)\
|
|
,\
|
|
$(if $(filter IOS,$(OS)),\
|
|
ios-armv7\
|
|
,\
|
|
$(if $(filter WNT,$(OS)),\
|
|
$(if $(filter GCC,$(COM)),\
|
|
mingw\
|
|
,\
|
|
$(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\
|
|
)\
|
|
,\
|
|
$(if $(filter MACOSX,$(OS)),\
|
|
$(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\
|
|
)\
|
|
)\
|
|
)\
|
|
)\
|
|
)
|
|
|
|
ifeq ($(COM),MSC)
|
|
$(call gb_ExternalProject_get_state_target,openssl,build):
|
|
$(call gb_ExternalProject_run,build,\
|
|
export CC="$(shell cygpath -w $(CC))" \
|
|
&& export PERL="$(shell cygpath -w $(PERL))" \
|
|
&& export LIB="$(ILIB)" \
|
|
&& $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \
|
|
&& cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \
|
|
&& unset MAKEFLAGS \
|
|
&& nmake -f "ms\ntdll.mak" \
|
|
)
|
|
|
|
else
|
|
$(call gb_ExternalProject_get_state_target,openssl,build):
|
|
$(call gb_ExternalProject_run,build,\
|
|
unset MAKEFLAGS \
|
|
&& $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\
|
|
$(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
|
|
$(OPENSSL_PLATFORM) \
|
|
$(if $(filter ANDROID,$(OS)),\
|
|
shared no-idea,\
|
|
$(if $(filter IOS,$(OS)),no-shared no-idea,\
|
|
$(if $(filter WNT,$(OS)),shared,\
|
|
shared no-idea \
|
|
$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \
|
|
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
|
|
&& $(MAKE) build_libs \
|
|
CC="$(CC) $(if $(filter-out WNT,$(OS)),\
|
|
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
|
|
-fvisibility=hidden))" \
|
|
)
|
|
endif
|
|
# vim: set noet sw=4 ts=4:
|