diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-12-03 20:32:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-03 20:32:13 +0000 |
| commit | 7848054080dfaeda9798a689f827ac1c3ee7907e (patch) | |
| tree | 804cb854c785418c92fe890032e4d00f2bdf3ebe /package | |
| parent | a5b02132fbb3b0937163963dc7e465900462e06d (diff) | |
dont set openssl arch to i386-i386 for i386 targets #495 by noah
Diffstat (limited to 'package')
| -rw-r--r-- | package/openssl/openssl.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index fbff929f9..0e6177135 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -10,19 +10,23 @@ OPENSSL_SITE:=http://www.openssl.org/source OPENSSL_SOURCE:=openssl-$(OPENSSL_VER).tar.gz OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VER) +OPENSSL_TARGET_ARCH:= ifeq ($(BR2_i386),y) ifeq ($(ARCH),i686) OPENSSL_TARGET_ARCH:=i386-i686/cmov -else +endif +ifneq ($(ARCH),i386) OPENSSL_TARGET_ARCH:=i386-$(ARCH) endif -else +endif +ifeq ($(OPENSSL_TARGET_ARCH),) OPENSSL_TARGET_ARCH:=$(ARCH) endif $(DL_DIR)/$(OPENSSL_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE) +openssl-unpack: $(OPENSSL_DIR)/.unpacked $(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch |