From abccea07e77e5ccd78b22c08c24841abac212ab8 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 14 Dec 2004 03:46:07 +0000 Subject: [PATCH] Set version of openssl which will work for this profile_arch. --- .../sparc/sparc64-multilib/dev/make.defaults | 13 +++++++++++-- .../default-linux/sparc/sparc64-multilib/packages | 5 +++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults index e74f28af8b8a..56205505f2f4 100644 --- a/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults +++ b/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.1 2004/12/11 02:12:13 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/dev/make.defaults,v 1.2 2004/12/14 03:46:07 eradicator Exp $ ARCH="sparc" ACCEPT_KEYWORDS="${ARCH}" @@ -8,7 +8,11 @@ ACCEPT_KEYWORDS="${ARCH}" # Used in ebuilds for verifying 64bit userland PROFILE_ARCH="sparc64-multilib" +# In theory, we should be able to just change this (in make.conf) to switch +# between building for 32/64bit CHOST="sparc64-unknown-linux-gnu" + +# Always use the sparc64 kernel PLATFORM="sparc64-unknown-linux-gnu" # Compiler flags @@ -27,7 +31,12 @@ USE="${GRP_STAGE23_USE} alsa bitmap-fonts crypt cups fortran f77 fbcon gif jpeg CONF_LIBDIR="lib64" CONF_MULTILIBDIR="lib" -CHOST32="sparc-unknown-linux-gnu" ARCH_WRAPPER="sparc32" + +CHOST32="sparc-unknown-linux-gnu" CC32="gcc32" CPP32="g++32" + +CHOST64="sparc64-unknown-linux-gnu" +CC64="gcc64" +CPP64="g++64" diff --git a/profiles/default-linux/sparc/sparc64-multilib/packages b/profiles/default-linux/sparc/sparc64-multilib/packages index b09e1bd89b00..9c70823b0af0 100644 --- a/profiles/default-linux/sparc/sparc64-multilib/packages +++ b/profiles/default-linux/sparc/sparc64-multilib/packages @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.2 2004/12/13 10:11:25 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/sparc/sparc64-multilib/packages,v 1.3 2004/12/14 03:46:07 eradicator Exp $ # Sometimes necessary to trick programs into thinking we're really # a sparc32 system. @@ -9,8 +9,9 @@ # Our gcc goes in /usr/lib/gcc rather than /usr/lib/gcc-bin *>=sys-devel/gcc-config-1.3.7-r5 -# Force versions that have been tested to work and are setup for multilib +# Force versions that have been tested to work, and are setup for multilib *>=sys-devel/binutils-2.15.92.0.2-r1 -*=sys-devel/gcc-3.4.3-r1 *>=sys-libs/glibc-2.3.4.20040808-r1 +>=dev-libs/openssl-0.9.7d-r2 -- 2.26.2