Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/06 01:55:32+01:00 handhelds.org!zecke
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/ich/programming/oe/openembedded

2005/01/06 01:55:10+01:00 handhelds.org!zecke
OpenSSL 0.9.7e:
	Add this version, apply the debian.patch,
	Makefile.ssl vanished so don't use it anymore

2005/01/06 01:42:12+01:00 handhelds.org!zecke
QtE-Fonts-Common:
	Only download recent QtE 3.3.3 once

2005/01/06 01:33:24+01:00 handhelds.org!zecke
OpenSSL 0.9.7[b;d]:
	openssl wants to use CC as assembler. OE/bitbake.conf sets AS to '*as'
	we need to revert that setting to be able to build openssl on platforms
	with assembler code (like md5 sum code for x86)

BKrev: 41dc96f6-JF5NoBfupVPnwdpwbf__w

6 files changed, 80 insertions, 0 deletions

diff --git a/packages/qte-fonts-common/qte-fonts-common_3.2.1.bb b/packages/openssl/openssl-0.9.7e/debian.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/qte-fonts-common/qte-fonts-common_3.2.1.bb
+++ b/packages/openssl/openssl-0.9.7e/debian.patch
diff --git a/packages/openssl/openssl_0.9.7b.bb b/packages/openssl/openssl_0.9.7b.bb
index 356c923398..684bd87098 100644
--- a/packages/openssl/openssl_0.9.7b.bb
+++ b/packages/openssl/openssl_0.9.7b.bb
@@ -9,6 +9,7 @@ AR_append = " r"
 export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
 export DIRS = "crypto ssl"
 export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+export AS = "${CC} -c"
 
 do_compile () {
 	perl util/perlpath.pl ${bindir}
diff --git a/packages/openssl/openssl_0.9.7c.bb b/packages/openssl/openssl_0.9.7c.bb
index 65f70b6b2c..de65ff7324 100644
--- a/packages/openssl/openssl_0.9.7c.bb
+++ b/packages/openssl/openssl_0.9.7c.bb
@@ -9,6 +9,7 @@ AR_append = " r"
 export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
 export DIRS = "crypto ssl"
 export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+export AS = "${CC} -c"
 
 do_compile () {
 	perl util/perlpath.pl ${bindir}
diff --git a/packages/openssl/openssl_0.9.7d.bb b/packages/openssl/openssl_0.9.7d.bb
index e69de29bb2..88ed06472f 100644
--- a/packages/openssl/openssl_0.9.7d.bb
+++ b/packages/openssl/openssl_0.9.7d.bb
@@ -0,0 +1,78 @@
+SECTION = "libs"
+DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
+HOMEPAGE = "http://www.openssl.org/"
+LICENSE = "openssl"
+PR = "r2"
+
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+	   file://debian.patch;patch=1"
+S = "${WORKDIR}/openssl-${PV}"
+
+AR_append = " r"
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+
+# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
+export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
+
+export DIRS = "crypto ssl apps"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+export AS = "${CC} -c"
+
+PACKAGES =+ "libcrypto libssl"
+FILES_libcrypto = "${libdir}/libcrypto.so*"
+FILES_libssl = "${libdir}/libssl.so*"
+
+do_compile () {
+	perl util/perlpath.pl ${bindir}
+	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+
+	#
+	# NOTE: Yes.  This does suck.  Ugh.
+	#
+	os=${HOST_OS}
+	if [ "x$os" = "xlinux-uclibc" ]; then
+		os=linux
+	fi
+	case $os-${HOST_ARCH} in
+	linux-arm)
+		target=linux-elf-arm
+		;;
+	linux-i[34]86)
+		target=linux-elf
+		;;
+	linux-i586)
+		target=linux-pentium
+		;;
+	linux-i686)
+		target=linux-ppro
+		;;
+	linux-mipsel)
+		target=linux-mipsel
+		;;
+        linux-powerpc)
+                target=linux-ppc
+                ;;
+	linux-x86_64)
+		target=linux-x86_64
+		;;
+	*)
+		die "Unsupported OS-ARCH ${HOST_OS}-${HOST_ARCH}"
+		;;
+	esac
+	perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+	oe_runmake -f Makefile.ssl
+}
+
+do_stage () {
+	cp --dereference -R include/openssl ${STAGING_INCDIR}/
+	oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
+	oe_libinstall -a -so libssl ${STAGING_LIBDIR}
+}
+
+do_install () {
+	install -m 0755 -d ${D}/${libdir}/pkgconfig
+	oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
+	chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc
+	oe_libinstall -so libcrypto ${D}/${libdir}
+	oe_libinstall -so libssl ${D}/${libdir}
+}
diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openssl/openssl_0.9.7e.bb
diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb