openssl/ExternalProject_openssl.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 96e1446f3235cb06c8b9e0ac5bce09b37fbe36bd
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Sep 12 10:17:24 2013 +0200
Unfortunately, openssl's "no-shared" apparently also implies no -fPIC
...so building dynamic libraries down the road that link in the openssl
archives
fails. Band-aid fix that by always passing in -fPIC (alternatives would be
to
patch the openssl Makefiles to only build archives and no dynamic libraries
even
under "shared" or to find another fix for the original Mac OS X hiden
visibility
program that triggered 9f8736411d454bfd711ef964288c50aae9f9e375 "Only build
in
ExternalProject_openssl what's needed in ExternalPackage_openssl").
Change-Id: I6b92ab55b0bbd340aacf325823b1f297e95f9197
diff --git a/openssl/ExternalProject_openssl.mk
b/openssl/ExternalProject_openssl.mk
index b825622..e41adb8 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -85,7 +85,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(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)),\
+ CC="$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
-fvisibility=hidden))" \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
