From 63bd1bdad863f6b25ef0fe682694b2430d1e7617 Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Fri, 21 Dec 2012 19:12:25 +0000
Subject: [PATCH] Actually enable 32bit builds.

This only works with paravirt so far.  Need to create a kernel .config for
x86.
---
 Makefile                     |  8 ++++++--
 make.conf => make.conf.amd64 |  0
 make.conf.x86                | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 rename make.conf => make.conf.amd64 (100%)
 create mode 100644 make.conf.x86

diff --git a/Makefile b/Makefile
index dc2592a..c6d8be8 100644
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,10 @@ DOWNLOAD_DIR = .downloads
 -include $(profile).cfg
 
 inroot := chroot $(CHROOT)
+ifeq ($(ARCH),x86)
+	inroot := linux32 $(inroot)
+endif
+
 stage4-exists := $(wildcard $(STAGE4_TARBALL))
 software-deps := stage3
 
@@ -148,8 +152,8 @@ else
 endif
 	touch stage3
 
-compile_options: portage make.conf locale.gen $(PACKAGE_FILES)
-	cp make.conf $(CHROOT)/etc/portage/make.conf
+compile_options: portage make.conf.$(ARCH) locale.gen $(PACKAGE_FILES)
+	cp make.conf.$(ARCH) $(CHROOT)/etc/portage/make.conf
 ifdef PKGDIR
 	echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf
 endif
diff --git a/make.conf b/make.conf.amd64
similarity index 100%
rename from make.conf
rename to make.conf.amd64
diff --git a/make.conf.x86 b/make.conf.x86
new file mode 100644
index 0000000..4fb53c5
--- /dev/null
+++ b/make.conf.x86
@@ -0,0 +1,14 @@
+CFLAGS="-Os"
+CXXFLAGS="-Os"
+CHOST="i686-pc-linux-gnu"
+MAKEOPTS="-j2"
+USE="-* nptl pam unicode"
+ALSA_PCM_PLUGINS="*"
+CLEAN_DELAY="0"
+EMERGE_WARNING_DELAY="0"
+AUTO_CLEAN="yes"
+EPAUSE_IGNORE="1"
+EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
+FEATURES="noinfo -test nodoc noman unmerge-orphans buildpkg notitles parallel-fetch"
+CURL_SSL="openssl"
+PYTHON_TARGETS="python2_7"