summaryrefslogtreecommitdiffstats
path: root/make/openssl.mk
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-12-30 09:47:45 +0000
committerEric Andersen <andersen@codepoet.org>2002-12-30 09:47:45 +0000
commit1fff9412193643edf3e7d975dc6ecaae672cca6f (patch)
tree5de615fd50826bf7e149293eb23f8d0a6ec5945c /make/openssl.mk
parenta9572b162b0d6279338b38c146c85f0333ef1a58 (diff)
downloadbuildroot-novena-1fff9412193643edf3e7d975dc6ecaae672cca6f.tar.gz
buildroot-novena-1fff9412193643edf3e7d975dc6ecaae672cca6f.zip
Fixup non-x86 openssl build
Diffstat (limited to 'make/openssl.mk')
-rw-r--r--make/openssl.mk28
1 files changed, 17 insertions, 11 deletions
diff --git a/make/openssl.mk b/make/openssl.mk
index 512bcdc5f..3f1ac988d 100644
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -8,28 +8,36 @@
OPENSSL_SITE:=http://www.openssl.org/source
OPENSSL_SOURCE:=openssl-0.9.6g.tar.gz
OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.6g
-
+OPENSSL_PATCH=$(SOURCE_DIR)/openssl.patch
$(DL_DIR)/$(OPENSSL_SOURCE):
$(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
-$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
+$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) $(OPENSSL_PATCH)
gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ cat $(OPENSSL_PATCH) | patch -p1 -d $(OPENSSL_DIR)
touch $(OPENSSL_DIR)/.unpacked
$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
(cd $(OPENSSL_DIR); \
- PATH=$(TARGET_PATH) ./Configure linux-elf --prefix=$(STAGING_DIR) \
+ PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=$(STAGING_DIR) \
--openssldir=$(STAGING_DIR) -L$(STAGING_DIR)/lib -ldl \
- -I$(STAGING_DIR)/include no-threads shared no-asm)
+ -I$(STAGING_DIR)/include $(OPENSSL_OPTS) no-threads \
+ shared no-idea no-mdc2 no-rc5)
$(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
- make CC=$(TARGET_CC1) -C $(OPENSSL_DIR)
+ make CC=$(TARGET_CC1) -C $(OPENSSL_DIR) all build-shared
-$(STAGING_DIR)/bin/openssl: $(OPENSSL_DIR)/apps/openssl
+$(STAGING_DIR)/lib/libcrypto.so.0: $(OPENSSL_DIR)/apps/openssl
make CC=$(TARGET_CC1) -C $(OPENSSL_DIR) install
-
-$(TARGET_DIR)/bin/openssl: $(STAGING_DIR)/bin/openssl
+ cp -fa $(OPENSSL_DIR)/libcrypto.so* $(STAGING_DIR)/lib/
+ (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.6 libcrypto.so)
+ (cd $(STAGING_DIR)/lib; ln -fs libcrypto.so.0.9.6 libcrypto.so.0)
+ cp -fa $(OPENSSL_DIR)/libssl.so* $(STAGING_DIR)/lib/
+ (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.6 libssl.so)
+ (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.6 libssl.so.0)
+
+$(TARGET_DIR)/lib/libcrypto.so.0: $(STAGING_DIR)/lib/libcrypto.so.0
cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/
cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/
#cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/
@@ -43,7 +51,5 @@ openssl-clean:
openssl-dirclean:
rm -rf $(OPENSSL_DIR)
-openssl: uclibc $(TARGET_DIR)/bin/openssl
-
-#EOF
+openssl: uclibc $(TARGET_DIR)/lib/libcrypto.so.0