diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2003-10-28 00:30:07 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2003-10-28 00:30:07 +0000 |
| commit | fdc9cc4c69e93fefc8d8e1154e0f8e6ccfd34a45 (patch) | |
| tree | 2117d299bb3cf262e3a0c7c347d07b78c34bb8bc /rules/openssl.make | |
| parent | 906c3664fe80a2f2a0f5734a5ecd33244f868f06 (diff) | |
| download | ptxdist-fdc9cc4c69e93fefc8d8e1154e0f8e6ccfd34a45.tar.gz ptxdist-fdc9cc4c69e93fefc8d8e1154e0f8e6ccfd34a45.tar.xz | |
* fixed deps:
openssl depends not on zlib
openssh does
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@689 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/openssl.make')
| -rw-r--r-- | rules/openssl.make | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/rules/openssl.make b/rules/openssl.make index e78655d03..c5368cfe8 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Id: openssl.make,v 1.11 2003/10/27 10:34:07 mkl Exp $ +# $Id: openssl.make,v 1.12 2003/10/28 00:30:07 mkl Exp $ # # Copyright (C) 2002 by Jochen Striepe for Pengutronix e.K., Hildesheim, Germany # 2003 by Pengutronix e.K., Hildesheim, Germany @@ -69,7 +69,6 @@ $(STATEDIR)/openssl.extract: $(STATEDIR)/openssl.get @$(call clean, $(OPENSSL_DIR)) @$(call extract, $(OPENSSL_SOURCE)) perl -p -i -e 's/-m486//' $(OPENSSL_DIR)/Configure -# perl -p -i -e 's/-O3/$CFLAGS/' $(OPENSSL_DIR)/Configure touch $@ # ---------------------------------------------------------------------------- @@ -80,7 +79,6 @@ openssl_prepare: $(STATEDIR)/openssl.prepare openssl_prepare_deps = \ $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/zlib.install \ $(STATEDIR)/openssl.extract OPENSSL_PATH = PATH=$(CROSS_PATH) @@ -115,6 +113,9 @@ openssl_compile: $(STATEDIR)/openssl.compile $(STATEDIR)/openssl.compile: $(STATEDIR)/openssl.prepare @$(call targetinfo, $@) +# +# generate openssl.pc with correct path inside +# $(OPENSSL_PATH) make -C $(OPENSSL_DIR) INSTALLTOP=$(CROSS_LIB_DIR) openssl.pc $(OPENSSL_PATH) make -C $(OPENSSL_DIR) $(OPENSSL_MAKEVARS) touch $@ @@ -127,12 +128,15 @@ openssl_install: $(STATEDIR)/openssl.install $(STATEDIR)/openssl.install: $(STATEDIR)/openssl.compile @$(call targetinfo, $@) +# +# broken Makfile, generates dir with wrong permissions... +# chmod 755 fixed that +# mkdir -p $(CROSS_LIB_DIR)/lib/pkgconfig chmod 755 $(CROSS_LIB_DIR)/lib/pkgconfig $(OPENSSL_PATH) make -C $(OPENSSL_DIR) install $(OPENSSL_MAKEVARS) \ INSTALL_PREFIX=$(CROSS_LIB_DIR) INSTALLTOP='' chmod 755 $(CROSS_LIB_DIR)/lib/pkgconfig - # # FIXME: # OPENSSL=${D}/usr/bin/openssl /usr/bin/perl tools/c_rehash ${D}/etc/ssl/certs @@ -146,7 +150,6 @@ $(STATEDIR)/openssl.install: $(STATEDIR)/openssl.compile openssl_targetinstall: $(STATEDIR)/openssl.targetinstall openssl_targetinstall_deps = \ - $(STATEDIR)/zlib.targetinstall \ $(STATEDIR)/openssl.install $(STATEDIR)/openssl.targetinstall: $(openssl_targetinstall_deps) |