svn commit: trunk/buildroot/package/openssl

vapier at uclibc.org vapier at uclibc.org
Fri Sep 30 01:52:03 UTC 2005


Author: vapier
Date: 2005-09-29 18:51:45 -0700 (Thu, 29 Sep 2005)
New Revision: 11700

Log:
ver bump by gnat in Bug 452 and make sure we configure as i386 with i[456]86 targets by schieli in Bug 450

Modified:
   trunk/buildroot/package/openssl/openssl.mk


Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk	2005-09-29 22:43:31 UTC (rev 11699)
+++ trunk/buildroot/package/openssl/openssl.mk	2005-09-30 01:51:45 UTC (rev 11700)
@@ -5,11 +5,17 @@
 #############################################################
 
 # TARGETS
-OPENSSL_VER:=0.9.7e
+OPENSSL_VER:=0.9.8
 OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_SOURCE:=openssl-$(OPENSSL_VER).tar.gz
 OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VER)
 
+ifeq ($(BR2_i386),y)
+OPENSSL_TARGET_ARCH:=i386-$(ARCH)
+else
+OPENSSL_TARGET_ARCH:=$(ARCH)
+endif
+
 $(DL_DIR)/$(OPENSSL_SOURCE):
 	$(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
 
@@ -26,7 +32,7 @@
 $(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
 	(cd $(OPENSSL_DIR); \
 	CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 $(TARGET_CFLAGS)" \
-	PATH=$(TARGET_PATH) ./Configure linux-$(ARCH) --prefix=/ \
+	PATH=$(TARGET_PATH) ./Configure linux-$(OPENSSL_TARGET_ARCH) --prefix=/ \
 		--openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
 		-I$(STAGING_DIR)/include $(OPENSSL_OPTS) no-threads \
 		shared no-idea no-mdc2 no-rc5)




More information about the uClibc-cvs mailing list