From fe277cb8205877245e0f1ee4fe72748cf5a88eda Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Wed, 12 Jan 2005 05:07:24 +0000
Subject: [PATCH] amd64 multilib header support.  Fixed missing ${D} in sparc
 header generation.

---
 eclass/kernel-2.eclass | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 7619b651fc72..6123c91a1240 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.75 2005/01/12 01:58:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.76 2005/01/12 05:07:24 eradicator Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -295,7 +295,7 @@ install_headers() {
 	dodir ${ddir}/asm
 
 	if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ] ; then
-		rm -Rf ${ddir}/asm
+		rm -Rf ${D}/${ddir}/asm
 		dodir ${ddir}/asm-sparc
 		dodir ${ddir}/asm-sparc64
 		cp -ax ${S}/include/asm-sparc/* ${D}/usr/include/asm-sparc
@@ -305,6 +305,17 @@ install_headers() {
 		cp -ax ${S}/include/asm/* ${D}/${ddir}/asm
 	fi
 
+	if [ "${ARCH}" = "amd64" ]; then
+		rm -Rf ${D}/${ddir}/asm
+		dodir ${ddir}/asm-i386
+		dodir ${ddir}/asm-x86_64
+		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm-i386
+		cp -ax ${S}/include/asm-x86_64/* ${D}/usr/include/asm-x86_64
+		/bin/sh ${FILESDIR}/generate-asm-amd64 ${D}/usr/include
+	else
+		cp -ax ${S}/include/asm/* ${D}/${ddir}/asm
+	fi
+
 	if kernel_is 2 6
 	then
 		dodir ${ddir}/asm-generic
@@ -814,6 +825,8 @@ detect_arch() {
 
 # Idea borrowed from RedHat's kernel package
 
+# This is gonna get replaced by something in multilib.eclass soon...
+# --eradicator
 generate_sparc_asm() {
 	local name
 
-- 
2.26.2