NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/openssl: fix coding style

Browse Source 
Currently, openssl defines three conditional hooks, but two do not
follow our coding rules:
  - for PRE_CONFIGURE, the hook is defined in the if-block, but
    the _HOOK variable is always set
  - for POST_INSTALL_TARGET, the hook is always defined, but the
    _HOOK variable is set in the if-block

Fix that:
  - define the hook in the if-block
  - assign the _HOOK variable in the if-block

At the same time, get rid of extra empty lines that make it more
difficult to read.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2013-12-05 22:46:49 +01:00 committed by Peter Korsgaard
parent 1f95d1a975
commit a17ec1645d
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/openssl/openssl.mk
View File

@ -19,9 +19,8 @@ define OPENSSL_DISABLE_APPS
$(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org $(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
$(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org $(SED) '/^DIRS=/ s/apps//' $(@D)/Makefile.org
endef endef
endif
OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
endif
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
@ -111,23 +110,19 @@ define OPENSSL_INSTALL_TARGET_CMDS
endef endef
ifneq ($(BR2_PREFER_STATIC_LIB),y) ifneq ($(BR2_PREFER_STATIC_LIB),y)
# libraries gets installed read only, so strip fails # libraries gets installed read only, so strip fails
define OPENSSL_INSTALL_FIXUPS_SHARED define OPENSSL_INSTALL_FIXUPS_SHARED
chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \ for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
do chmod +w $$i; done do chmod +w $$i; done
endef endef
OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED
endif endif
ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
define OPENSSL_REMOVE_OPENSSL_ENGINES define OPENSSL_REMOVE_OPENSSL_ENGINES
rm -rf $(TARGET_DIR)/usr/lib/engines rm -rf $(TARGET_DIR)/usr/lib/engines
endef endef
ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_ENGINES OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_ENGINES
endif endif