Kaydet (Commit) 9f873641 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Only build in ExternalProject_openssl what's needed in ExternalPackage_openssl

...i.e., for non-MSC always use "non-shared" (this also prevents a build error
when using -fvisibility-hidden on Mac OS X and linking fips_premain_dso misses
symbols) and just build "lib_crypto lib_ssl".  Also cleaned up the rest of the
configure command line while trying not to change any of its meaning (and I have
no idea about WNT-GCC lacking "no-idea", likely just lots of cargo cult there
awaiting further clean-up).

Change-Id: I34ec43975cda7af800eeba5d4f6a0beaeca6f6bc
üst b8ddbddf
...@@ -73,19 +73,18 @@ $(call gb_ExternalProject_get_state_target,openssl,build): ...@@ -73,19 +73,18 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
else else
$(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
unset MAKEFLAGS \ unset MAKEFLAGS && \
&& $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)), \
$(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \ ./Configure, \
$(OPENSSL_PLATFORM) \ $(if $(filter WNT,$(OS)), \
no-dso \ $(PERL) Configure, \
$(if $(filter ANDROID,$(OS)),\ ./config)) \
shared no-idea,\ $(OPENSSL_PLATFORM) no-dso no-shared \
$(if $(filter IOS,$(OS)),no-shared no-idea,\ $(if $(filter-out WNT,$(OS)),no-idea) \
$(if $(filter WNT,$(OS)),shared,\ $(if $(filter-out ANDROID IOS WNT,$(OS)), \
shared no-idea \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \
$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) build_libs \ && $(MAKE) build_crypto build_ssl \
CC="$(CC) $(if $(filter-out WNT,$(OS)),\ CC="$(CC) $(if $(filter-out WNT,$(OS)),\
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
-fvisibility=hidden))" \ -fvisibility=hidden))" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment