summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-06-21 11:40:34 +0000
committerFabian Groffen <grobian@gentoo.org>2009-06-21 11:40:34 +0000
commit2dcddd66ec4e3797a6a973672f967eb1c4df91a2 (patch)
treec077c52ddb8a801820e5077606fee89991058154 /dev-libs/openssl
parentVersion bump (diff)
downloadgentoo-2-2dcddd66ec4e3797a6a973672f967eb1c4df91a2.tar.gz
gentoo-2-2dcddd66ec4e3797a6a973672f967eb1c4df91a2.tar.bz2
gentoo-2-2dcddd66ec4e3797a6a973672f967eb1c4df91a2.zip
update gentoo.config script to include support for Prefix arches
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/ChangeLog6
-rwxr-xr-xdev-libs/openssl/files/gentoo.config-0.9.846
2 files changed, 47 insertions, 5 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index ea21501346e0..ef7c71aa6faa 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/openssl
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.291 2009/05/29 23:32:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.292 2009/06/21 11:40:33 grobian Exp $
+
+ 21 Jun 2009; Fabian Groffen <grobian@gentoo.org>
+ files/gentoo.config-0.9.8:
+ update gentoo.config script to include support for Prefix arches
29 May 2009; Mike Frysinger <vapier@gentoo.org>
-files/openssl-0.9.8b-parallel-build.patch, -openssl-0.9.8h-r1.ebuild,
diff --git a/dev-libs/openssl/files/gentoo.config-0.9.8 b/dev-libs/openssl/files/gentoo.config-0.9.8
index e2cf248eb243..b096d34bfc33 100755
--- a/dev-libs/openssl/files/gentoo.config-0.9.8
+++ b/dev-libs/openssl/files/gentoo.config-0.9.8
@@ -1,7 +1,7 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
+#!/usr/bin/env bash
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.8,v 1.16 2007/04/01 11:03:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-0.9.8,v 1.17 2009/06/21 11:40:34 grobian Exp $
#
# Openssl doesn't play along nicely with cross-compiling
# like autotools based projects, so let's teach it new tricks.
@@ -26,6 +26,12 @@ if [[ $1 == "test" ]] ; then
"hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
"powerpc-gentOO-linux-uclibc |linux-ppc" \
"powerpc64-unk-linux-gnu |linux-ppc64" \
+ "x86_64-apple-darwinX |darwin64-x86_64-cc" \
+ "powerpc64-apple-darwinX |darwin64-ppc-cc" \
+ "i686-apple-darwinX |darwin-i386-cc" \
+ "i386-apple-darwinX |darwin-i386-cc" \
+ "powerpc-apple-darwinX |darwin-ppc-cc" \
+ "i586-pc-winnt |winnt-parity" \
;do
CHOST=${c/|*}
ret_want=${c/*|}
@@ -46,8 +52,13 @@ fi
# Detect the operating system
case ${CHOST} in
- *-linux*) system="linux";;
+ *-aix*) system="aix";;
+ *-darwin*) system="darwin";;
*-freebsd*) system="BSD";;
+ *-hpux*) system="hpux";;
+ *-linux*) system="linux";;
+ *-solaris*) system="solaris";;
+ *-winnt*) system="winnt";;
*) exit 0;;
esac
@@ -100,6 +111,33 @@ BSD)
*) machine=generic32;;
esac
;;
+aix)
+ machine=${compiler}
+ ;;
+darwin)
+ case ${chost_machine} in
+ powerpc64) machine=ppc-cc; system=${system}64;;
+ powerpc) machine=ppc-cc;;
+ i?86*) machine=i386-cc;;
+ x86_64) machine=x86_64-cc; system=${system}64;;
+ esac
+ ;;
+hpux)
+ case ${chost_machine} in
+ ia64) machine=ia64-${compiler} ;;
+ esac
+ ;;
+solaris)
+ case ${chost_machine} in
+ i386) machine=x86-${compiler} ;;
+ x86_64*) machine=x86_64-${compiler}; system=${system}64;;
+ sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
+ sparc*) machine=sparcv8-${compiler};;
+ esac
+ ;;
+winnt)
+ machine=parity
+ ;;
esac