diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-31 09:16:08 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-31 09:22:13 +0100 |
| commit | dcea8230b6c971bc0f9e209c570866122c43deb0 (patch) | |
| tree | 6cf25e3d78042b381d9367e569f8fbc8d08c575d /rules/openssl.make | |
| parent | 4408a6789259d8c5faf87b0cb3283515df4d8586 (diff) | |
| download | ptxdist-dcea8230b6c971bc0f9e209c570866122c43deb0.tar.gz ptxdist-dcea8230b6c971bc0f9e209c570866122c43deb0.tar.xz | |
openssl: always build shared libraries
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/openssl.make')
| -rw-r--r-- | rules/openssl.make | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/rules/openssl.make b/rules/openssl.make index cd03b734d..2dcbc855f 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -31,8 +31,8 @@ OPENSSL_LICENSE := openssl # Prepare # ---------------------------------------------------------------------------- -OPENSSL_CONF_ENV := $(CROSS_ENV) -OPENSSL_MAKE_PAR := NO +OPENSSL_CONF_ENV := $(CROSS_ENV) +OPENSSL_MAKE_PAR := NO OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I386) += debian-i386 OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I486) += debian-i386-i486 @@ -69,16 +69,12 @@ endif OPENSSL_CONF_OPT := \ --prefix=/usr \ --openssldir=/usr/lib/ssl \ - --install_prefix=$(OPENSSL_PKGDIR) + --install_prefix=$(OPENSSL_PKGDIR) \ + shared + OPENSSL_INSTALL_OPT := \ install_sw -ifdef PTXCONF_OPENSSL_SHARED -OPENSSL_CONF_OPT += shared -else -OPENSSL_CONF_OPT += no-shared -endif - $(STATEDIR)/openssl.prepare: @$(call targetinfo) cd $(OPENSSL_DIR) && \ @@ -103,10 +99,9 @@ ifdef PTXCONF_OPENSSL_BIN @$(call install_copy, openssl, 0, 0, 0755, -, \ /usr/bin/openssl) endif -ifdef PTXCONF_OPENSSL_SHARED @$(call install_lib, openssl, 0, 0, 0644, libssl) @$(call install_lib, openssl, 0, 0, 0644, libcrypto) -endif + @$(call install_finish, openssl) @$(call touch) |