From 484a051cd6f73274df7153c0a4248250089df581 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Sun, 9 May 2004 03:00:51 +0000
Subject: Merge ssh://openembedded@openembedded.bkbits.net/packages into
doomcom.org:/home/gbritton/devel/OE/packages
2004/05/08 22:53:02-04:00 doomcom.org!gbritton
more flexible openssl target pain
BKrev: 409d9ee3HZ2o5Awg2jDpAhtaJWFBBw
---
openssl/openssl_0.9.7d.oe | 41 ++++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 11 deletions(-)
(limited to 'openssl')
diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe
index c65bf4b94e..11902d4e3f 100644
--- a/openssl/openssl_0.9.7d.oe
+++ b/openssl/openssl_0.9.7d.oe
@@ -13,18 +13,37 @@ export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
do_compile () {
perl util/perlpath.pl ${bindir}
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
- if test "X${TARGET_OS}" = "Xlinux"; then
- target=${TARGET_OS}-elf
- else
- target=${TARGET_OS}
- fi
- if ! test "X${BUILD_SYS}" = "X${TARGET_SYS}" -o \
- "X${TARGET_ARCH}" = "Xi386" -o \
- "X${TARGET_ARCH}" = "Xi686" -o \
- "X${TARGET_ARCH}" = "Xi586" -o \
- "X${TARGET_ARCH}" = "Xi486"; then
- target="$target-${TARGET_ARCH}"
+
+ #
+ # 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-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
perl ./Configure no-shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
--
cgit v1.2.3