diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-03 22:41:29 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-11 22:48:13 +0100 |
| commit | 665e13c85e1fd216499cdd335a88a4d1c20f175f (patch) | |
| tree | 5ecc87c54905105b96cbe9891028ef8eb3d713b1 /package/openssl | |
| parent | 2d23d40279be39f70553974de11a5fc088622911 (diff) | |
| download | buildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.tar.gz buildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.zip | |
Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.
As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.
This also helps preparing the addition of other options to select
shared, shared+static or just static.
Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'package/openssl')
| -rw-r--r-- | package/openssl/openssl.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index fe7ebf25f7..5dc937ab63 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -80,14 +80,14 @@ define OPENSSL_CONFIGURE_CMDS --openssldir=/etc/ssl \ --libdir=/lib \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ - $(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \ + $(if $(BR2_STATIC_LIBS),no-shared,shared) \ no-idea \ no-rc5 \ enable-camellia \ enable-mdc2 \ enable-tlsext \ - $(if $(BR2_PREFER_STATIC_LIB),zlib,zlib-dynamic) \ - $(if $(BR2_PREFER_STATIC_LIB),no-dso) \ + $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ + $(if $(BR2_STATIC_LIBS),no-dso) \ ) $(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile $(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile @@ -117,7 +117,7 @@ define OPENSSL_INSTALL_TARGET_CMDS endef # libdl has no business in a static build -ifeq ($(BR2_PREFER_STATIC_LIB),y) +ifeq ($(BR2_STATIC_LIBS),y) define OPENSSL_FIXUP_STATIC_PKGCONFIG $(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc $(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc @@ -126,7 +126,7 @@ endef OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG endif -ifneq ($(BR2_PREFER_STATIC_LIB),y) +ifneq ($(BR2_STATIC_LIBS),y) # libraries gets installed read only, so strip fails define OPENSSL_INSTALL_FIXUPS_SHARED chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so |
