[openssl] reworked + version bump to 0.9.8k

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10964 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 64 insertions, 115 deletions

diff --git a/rules/openssl.make b/rules/openssl.make
index a3311612a..4dd73acad 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -1,8 +1,8 @@
 # -*-makefile-*-
-# $Id$
 #
 # Copyright (C) 2002 by Jochen Striepe for Pengutronix e.K., Hildesheim, Germany
 #               2003-2008 by Pengutronix e.K., Hildesheim, Germany
+#		2009 by Marc Kleine-Budde <mkl@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -18,66 +18,14 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
 #
 # Paths and names
 #
-OPENSSL_VERSION		:= 0.9.7g
-OPENSSL			:= openssl-$(OPENSSL_VERSION)
-OPENSSL_URL 		:= http://www.openssl.org/source/$(OPENSSL).tar.gz
-OPENSSL_SOURCE		:= $(SRCDIR)/$(OPENSSL).tar.gz
-OPENSSL_DIR 		:= $(BUILDDIR)/$(OPENSSL)
-
-ifeq ($(PTXCONF_ARCH_ARM)$(PTXCONF_ENDIAN_LITTLE),yy)
-	OPENSSL_THUD := linux-arm
-endif
-
-ifeq ($(PTXCONF_ARCH_ARM)$(PTXCONF_ENDIAN_BIG),yy)
-	OPENSSL_THUD := linux-armeb
-endif
-
-ifdef PTXCONF_ARCH_M68K
-	OPENSSL_THUD = linux-m68k
-endif
-
-ifeq ($(PTXCONF_ARCH_MIPS)$(PTXCONF_ENDIAN_LITTLE),yy)
-	OPENSSL_THUD := linux-mipsel
-endif
-
-ifeq ($(PTXCONF_ARCH_MIPS)$(PTXCONF_ENDIAN_BIG),yy)
-	OPENSSL_THUD := linux-mips
-endif
-
-ifdef PTXCONF_ARCH_X86
-ifdef PTXCONF_ARCH_I586
-	OPENSSL_THUD := linux-i386-i586
-else
-ifdef PTXCONF_ARCH_I686
-	OPENSSL_THUD := linux-i386-i686/cmov
-else
-	OPENSSL_THUD := linux-i386
-endif
-endif
-endif
-
-ifdef PTXCONF_ARCH_PPC
-	OPENSSL_THUD := linux-ppc
-endif
-
-ifdef PTXCONF_ARCH_SPARC
-	OPENSSL_THUD := linux-sparc
-endif
-
-ifdef PTXCONF_ARCH_SH
-ifeq ($(PTXCONF_ARCH_SH_SH3)$(PTXCONF_ENDIAN_LITTLE),yy)
-	OPENSSL_THUD := linux-sh3
-endif
-ifeq ($(PTXCONF_ARCH_SH_SH3)$(PTXCONF_ENDIAN_BIG),yy)
-	OPENSSL_THUD := linux-sh3eb
-endif
-ifeq ($(PTXCONF_ARCH_SH_SH4)$(PTXCONF_ENDIAN_LITTLE),yy)
-	OPENSSL_THUD := linux-sh4
-endif
-ifeq ($(PTXCONF_ARCH_SH_SH4)$(PTXCONF_ENDIAN_BIG),yy)
-	OPENSSL_THUD := linux-sh4eb
-endif
-endif
+OPENSSL_VERSION	:= 0.9.8k
+OPENSSL		:= openssl-$(OPENSSL_VERSION)
+OPENSSL_SUFFIX	:= tar.gz
+OPENSSL_URL	:= http://openssl.org/source//$(OPENSSL).$(OPENSSL_SUFFIX)
+OPENSSL_SOURCE	:= $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
+OPENSSL_DIR	:= $(BUILDDIR)/$(OPENSSL)
+OPENSSL_PKGDIR	:= $(PKGDIR)/$(OPENSSL)
+OPENSSL_LICENSE	:= openssl
 
 # ----------------------------------------------------------------------------
 # Get
@@ -91,61 +39,58 @@ $(OPENSSL_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-OPENSSL_PATH	= PATH=$(CROSS_PATH)
-OPENSSL_MAKEVARS = \
-	$(CROSS_ENV_CC) \
-	$(CROSS_ENV_RANLIB) \
-	AR='$(CROSS_AR) r' \
-	MANDIR=/man
-
-OPENSSL_AUTOCONF = \
-	--openssldir=/etc/ssl
-
-ifdef PTXCONF_OPENSSL_SHARED
-OPENSSL_AUTOCONF	+= shared
+OPENSSL_PATH	:= PATH=$(CROSS_PATH)
+OPENSSL_ENV 	:= $(CROSS_ENV)
+OPENSSL_MAKE_PAR := NO
+
+OPENSSL_ARCH-$(PTXCONF_ARCH_I386)	+= debian-i386
+OPENSSL_ARCH-$(PTXCONF_ARCH_I486)	+= debian-i386-i486
+OPENSSL_ARCH-$(PTXCONF_ARCH_I586)	+= debian-i386-i586
+OPENSSL_ARCH-$(PTXCONF_ARCH_I686)	+= debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P2)	+= debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P3M)	+= debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_M68K)	+= debian-m68k
+OPENSSL_ARCH-$(PTXCONF_ARCH_PPC)	+= debian-powerpc
+OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC)	+= debian-sparc
+
+ifdef PTXCONF_ENDIAN_LITTLE
+OPENSSL_ARCH-$(PTXCONF_ARCH_ARM)	+= debian-armel
+OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS)	+= debian-mipsel
+OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3)	+= debian-sh3
+OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4)	+= debian-sh4
 else
-OPENSSL_AUTOCONF	+= no-shared
+OPENSSL_ARCH-$(PTXCONF_ARCH_ARM)	+= debian-armeb
+OPENSSL_ARCH-$(PTXCONF_ARCH_MIPS)	+= debian-mips
+OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH3)	+= debian-sh3eb
+OPENSSL_ARCH-$(PTXCONF_ARCH_SH_SH4)	+= debian-sh4eb
 endif
 
-$(STATEDIR)/openssl.prepare: $(openssl_prepare_deps_default)
-	@$(call targetinfo)
-	cd $(OPENSSL_DIR) && \
-		$(OPENSSL_PATH) \
-		./Configure $(OPENSSL_THUD) $(OPENSSL_AUTOCONF)
-	@$(call touch)
+ifdef PTXCONF_OPENSSL
+ifndef OPENSSL_ARCH-y
+$(error *** Sorry unsupported ARCH in openssl.make)
+endif
+endif
 
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
 
-$(STATEDIR)/openssl.compile:
-	@$(call targetinfo)
 #
-# generate openssl.pc with correct path inside
+# autoconf
 #
-	cd $(OPENSSL_DIR) && $(OPENSSL_PATH) $(MAKE) INSTALLTOP=$(SYSROOT) openssl.pc
-	cd $(OPENSSL_DIR) && $(OPENSSL_PATH) $(MAKE) $(OPENSSL_MAKEVARS) $(PARALLELMFLAGS_BROKEN)
-	@$(call touch)
+OPENSSL_AUTOCONF := \
+	--prefix=/usr \
+	--openssldir=/usr/lib/ssl \
+	--install_prefix=$(OPENSSL_PKGDIR)
 
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
+ifdef PTXCONF_OPENSSL_SHARED
+OPENSSL_AUTOCONF += shared
+else
+OPENSSL_AUTOCONF += no-shared
+endif
 
-$(STATEDIR)/openssl.install:
+$(STATEDIR)/openssl.prepare:
 	@$(call targetinfo)
-#
-# broken Makefile, generates dir with wrong permissions...
-# chmod 755 fixed that
-#
-	mkdir -p $(SYSROOT)/lib/pkgconfig
-	chmod 755 $(SYSROOT)/lib/pkgconfig
-	$(OPENSSL_PATH) make -C $(OPENSSL_DIR) install $(OPENSSL_MAKEVARS) \
-		INSTALL_PREFIX=$(SYSROOT) INSTALLTOP=''
-	chmod 755 $(SYSROOT)/lib/pkgconfig
-#
-# FIXME:
-# 	OPENSSL=${D}/usr/bin/openssl /usr/bin/perl tools/c_rehash ${D}/etc/ssl/certs
-#
+	cd $(OPENSSL_DIR) && \
+		$(OPENSSL_PATH) $(OPENSSL_ENV) \
+		./Configure $(OPENSSL_ARCH-y) $(OPENSSL_AUTOCONF)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -155,29 +100,33 @@ $(STATEDIR)/openssl.install:
 $(STATEDIR)/openssl.targetinstall:
 	@$(call targetinfo)
 
-	@$(call install_init, openssl)
+	@$(call install_init,  openssl)
 	@$(call install_fixup, openssl,PACKAGE,openssl)
 	@$(call install_fixup, openssl,PRIORITY,optional)
 	@$(call install_fixup, openssl,VERSION,$(OPENSSL_VERSION))
 	@$(call install_fixup, openssl,SECTION,base)
-	@$(call install_fixup, openssl,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, openssl,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, openssl,DEPENDS,)
 	@$(call install_fixup, openssl,DESCRIPTION,missing)
 
 ifdef PTXCONF_OPENSSL_BIN
-	@$(call install_copy, openssl, 0, 0, 0755, $(OPENSSL_DIR)/apps/openssl, /usr/bin/openssl)
+	@$(call install_copy, openssl, 0, 0, 0755, -, \
+		/usr/bin/openssl)
 endif
 
 ifdef PTXCONF_OPENSSL_SHARED
-	@$(call install_copy, openssl, 0, 0, 0644, $(OPENSSL_DIR)/libssl.so.0.9.7, /usr/lib/libssl.so.0.9.7)
-	@$(call install_link, openssl, libssl.so.0.9.7, /usr/lib/libssl.so.0)
-	@$(call install_link, openssl, libssl.so.0.9.7, /usr/lib/libssl.so)
+	@$(call install_copy, openssl, 0, 0, 0644, -, \
+		/usr/lib/libssl.so.0.9.8)
+	@$(call install_link, openssl, libssl.so.0.9.8, /usr/lib/libssl.so.0)
+	@$(call install_link, openssl, libssl.so.0.9.8, /usr/lib/libssl.so)
 
-	@$(call install_copy, openssl, 0, 0, 0644, $(OPENSSL_DIR)/libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0.9.7)
-	@$(call install_link, openssl, libcrypto.so.0.9.7, /usr/lib/libcrypto.so.0)
-	@$(call install_link, openssl, libcrypto.so.0.9.7, /usr/lib/libcrypto.so)
+	@$(call install_copy, openssl, 0, 0, 0644, -, \
+		/usr/lib/libcrypto.so.0.9.8)
+	@$(call install_link, openssl, libcrypto.so.0.9.8, /usr/lib/libcrypto.so.0)
+	@$(call install_link, openssl, libcrypto.so.0.9.8, /usr/lib/libcrypto.so)
 endif
 	@$(call install_finish, openssl)
+
 	@$(call touch)
 
 # ----------------------------------------------------------------------------