[gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/

[Anthony G. Basile]

commit:     00b82b174715e534e78f6742c3389726932cece8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 19:12:42 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 19:18:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=00b82b17

sys-libs/uclibc: use config file from FILESDIR

---
 sys-libs/uclibc/files/uclibc.config     |  265 +++++++++++++++++++++++
 sys-libs/uclibc/metadata.xml            |   10 +-
 sys-libs/uclibc/uclibc-0.9.32-r1.ebuild |   57 -----
 sys-libs/uclibc/uclibc-0.9.32.ebuild    |  356 ++-----------------------------
 4 files changed, 283 insertions(+), 405 deletions(-)

diff --git a/sys-libs/uclibc/files/uclibc.config b/sys-libs/uclibc/files/uclibc.config
new file mode 100644
index 0000000..f575ca2
--- /dev/null
+++ b/sys-libs/uclibc/files/uclibc.config
@@ -0,0 +1,265 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.32
+# Sat Dec 31 16:47:23 2011
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+TARGET_i386=y
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+# TARGET_c6x is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="i386"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+CONFIG_586=y
+# CONFIG_586MMX is not set
+# CONFIG_686 is not set
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH="i586"
+
+#
+# Using ELF file format
+#
+ARCH_LITTLE_ENDIAN=y
+
+#
+# Using Little Endian
+#
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+DO_XSI_MATH=y
+UCLIBC_HAS_FENV=y
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/usr/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+FORCE_SHAREABLE_TEXT_SEGMENTS=y
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+LDSO_PRELOAD_ENV_SUPPORT=y
+LDSO_PRELOAD_FILE_SUPPORT=y
+LDSO_BASE_FILENAME="ld.so"
+UCLIBC_STATIC_LDCONFIG=y
+LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+UCLIBC_CTOR_DTOR=y
+LDSO_GNU_HASH_SUPPORT=y
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+# LINUXTHREADS_NEW is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+UCLIBC_HAS_THREADS=y
+PTHREADS_DEBUG_SUPPORT=y
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_STRICT_HEADERS=y
+UCLIBC_HAS_STUBS=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_24=y
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+# UCLIBC_HAS_PROFILING is not set
+UCLIBC_HAS_CRYPT_IMPL=y
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+UCLIBC_HAS_BSD_RES_CLOSE=y
+UCLIBC_HAS_COMPAT_RES_STATE=y
+UCLIBC_HAS_EXTRA_COMPAT_RES_STATE=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+UCLIBC_HAS_FOPEN_LARGEFILE_MODE=y
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+UCLIBC_HAS_SYS_ERRLIST=y
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+UCLIBC_HAS_SYS_SIGLIST=y
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_FTS=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+UCLIBC_HAS_UTMPX=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/usr"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+UCLIBC_BUILD_PIE=y
+UCLIBC_HAS_ARC4RANDOM=y
+# HAVE_NO_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+# PROPOLICE_BLOCK_ABRT is not set
+PROPOLICE_BLOCK_SEGV=y
+UCLIBC_BUILD_SSP=y
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX="i386-gentoo-linux-uclibc-"
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index bcb329d..e217c37 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -2,10 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>hardened</herd>
-	<use>
-		<flag name='ssp'>Force the use of ssp to be built into a hardened uclibc setup</flag>
-		<flag name='savedconfig'>Adds support for user defined configs</flag>
-		<flag name='uclibc-compat'>Build uclibc with backwards compatible options</flag>
-		<flag name='wordexp'>Add support for word expansion (wordexp.h)</flag>
-	</use>
+	<maintainer>
+		<email>blueness@g.o</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/uclibc/uclibc-0.9.32-r1.ebuild b/sys-libs/uclibc/uclibc-0.9.32-r1.ebuild
deleted file mode 100644
index 42b99f4..0000000
--- a/sys-libs/uclibc/uclibc-0.9.32-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
-
-EAPI="4"
-
-inherit eutils savedconfig
-
-MY_P=uClibc-0.9.32
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
-SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="savedconfig"
-RESTRICT="strip"
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-BJA-sandbox.patch
-	epatch "${FILESDIR}"/${P}-fix_epoll.patch
-}
-
-src_configure() {
-	use savedconfig && restore_config .config
-}
-
-src_compile() {
-	emake headers || die "make headers failed"
-	emake || die "make failed"
-	emake utils || die "make utils failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	use savedconfig && save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${D}"/usr/include/{linux,asm*}
-
-	emake DESTDIR="${D}" install_utils || die "install-utils failed"
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	echo "UTC" > "${ROOT}"/etc/TZ
-	/sbin/ldconfig
-	[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-}

diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclibc-0.9.32.ebuild
index 97990b7..43d630b 100644
--- a/sys-libs/uclibc/uclibc-0.9.32.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.32.ebuild
@@ -2,383 +2,55 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $
 
-#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs savedconfig
+EAPI="4"
 
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc* ]] ; then
-	export UCLIBC_AND_GLIBC="sitting in a tree"
-	export CTARGET=${CHOST%%-*}-pc-linux-uclibc
-fi
+inherit eutils
 
 MY_P=uClibc-0.9.32
-PATCH_VER=""
-SVN_VER=""
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="http://www.uclibc.org/"
 SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2"
 
-[[ -z ${SVN_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.patch.bz2"
-[[ -z ${PATCH_VER} ]] || \
-	SRC_URI="${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="build uclibc-compat debug hardened ssp ipv6 minimal nptl wordexp crosscompile_opts_headers-only"
+IUSE="savedconfig"
 RESTRICT="strip"
 
 RDEPEND=""
-if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then
-	DEPEND=">=cross-${CTARGET}/binutils-2.21.51.0.7"
-	SLOT="${CTARGET}"
-else
-	DEPEND="virtual/os-headers app-misc/pax-utils"
-	SLOT="0"
-fi
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \
-	   || [[ -n ${UCLIBC_AND_GLIBC} ]]
-	then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "big";;
-		*" LSB "*) echo "little";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	just_headers && return 0
-	has_version ${CATEGORY}/uclibc || return 0
-	[[ -n ${UCLIBC_AND_GLIBC} ]] && return 0
-	[[ ${ROOT} != "/" ]] && return 0
-	[[ ${CATEGORY} == cross-* ]] && return 0
-
-}
-
-PIE_STABLE="arm mips ppc x86"
-
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
-check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
-}
-
-set_opt() {
-	sed -i -e "/^\# $1 is not set/d" -e "/^$1=.*/d" .config
-	echo "$1=$2" >> .config
-}
-get_opt() {
-	(
-	unset $1
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_unpack() {
-	[[ -n ${ESVN_REPO_URI} ]] \
-		&& subversion_src_unpack \
-		|| unpack ${A}
-	cd "${S}"
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## PATCHES ##########
-
-	[[ -n ${SVN_VER} ]] && \
-		epatch "${WORKDIR}"/${MY_P}-cvs-update-${SVN_VER}.patch
-
-	if [[ -n ${PATCH_VER} ]] ; then
-		unpack ${MY_P}-patches-${PATCH_VER}.tar.bz2
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-	fi
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-BJA-sandbox.patch
 	epatch "${FILESDIR}"/${P}-fix_epoll.patch
+}
 
-	########## CPU SELECTION ##########
-
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
-	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	########## CONFIG SETUP ##########
-
-	make ARCH=${target} defconfig >/dev/null || die "could not config"
-
-	for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} UCLIBC_HAS_PROFILING; do
-		sed -i -e "s:${def}=y:# ${def} is not set:" .config
-	done
-	if use debug ; then
-		set_opt SUPPORT_LD_DEBUG y
-		set_opt DODEBUG y
-	fi
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	set_opt "ARCH_WANTS_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN" y
-
-	if [[ $(tc-is-softfloat) != "no" ]] ; then
-		set_opt UCLIBC_HAS_FPU n
-	fi
-
-	if [[ ${CTARGET/eabi} != ${CTARGET} ]] ; then
-		set_opt CONFIG_ARM_OABI n
-		set_opt CONFIG_ARM_EABI y
-	fi
-
-	local moredefs="COMPAT_ATEXIT"
-	local compat_sym=atexit
-
-	# We need todo this for a few months. .30 is a major upgrade.
-	# Don't do it from cross-compiling case though
-	if ! use uclibc-compat ; then
-		if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \
-		   ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then
-			local fnames=""
-			einfo "Doing a scanelf in paths for bins containing the ${compat_sym} symbol"
-			fnames=$(scanelf -pyqs${compat_sym} -F%F#s)
-			if [[ -z ${fnames} ]] ; then
-				einfo "This system is clean."
-				einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1"
-				moredefs=""
-			else
-				ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled."
-				ewarn "qfile -Cq $(echo ${fnames}) | sort | uniq"
-				echo
-				ewarn "Leaving on ${moredefs}"
-			fi
-		else
-			moredefs=""
-		fi
-	fi
-	for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,FULL_RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} UCLIBC_HAS_REENTRANT_RPC  UCLIBC_HAS_GNU_GLOB PTHREADS_DEBUG_SUPPORT UCLIBC_HAS_TZ_FILE_READ_MANY UCLIBC_HAS_FENV UCLIBC_SUSV3_LEGACY UCLIBC_SUSV3_LEGACY_MACROS UCLIBC_HAS_PROGRAM_INVOCATION_NAME ; do
-		set_opt "${def}" y
-	done
-	set_opt UCLIBC_HAS_CTYPE_UNSAFE n
-	set_opt UCLIBC_HAS_LOCALE n
-	set_opt HAS_NO_THREADS n
-
-	use nptl && set_opt LINUXTHREADS_NEW y
-
-	use ipv6 && set_opt UCLIBC_HAS_IPV6 y
-
-	use wordexp && set_opt UCLIBC_HAS_WORDEXP y
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	set_opt UCLIBC_HAS_SSP y
-	set_opt UCLIBC_HAS_SSP_COMPAT y
-	set_opt UCLIBC_HAS_ARC4RANDOM y
-	set_opt PROPOLICE_BLOCK_ABRT n
-	set_opt PROPOLICE_BLOCK_SEGV y
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc; then
-		set_opt UCLIBC_BUILD_NOEXECSTACK y
-	else
-		set_opt UCLIBC_BUILD_NOEXECSTACK n
-	fi
-	set_opt UCLIBC_BUILD_RELRO y
-	if use hardened ; then
-		if has $(tc-arch) ${PIE_STABLE} ; then
-			set_opt UCLIBC_BUILD_PIE y
-		else
-			set_opt UCLIBC_BUILD_PIE n
-		fi
-		set_opt UCLIBC_BUILD_NOW y
-		use ssp && {
-			set_opt SSP_QUICK_CANARY n
-			set_opt UCLIBC_BUILD_SSP y
-		}
-	else
-		set_opt UCLIBC_BUILD_PIE n
-		set_opt SSP_QUICK_CANARY y
-		set_opt UCLIBC_BUILD_SSP n
-		set_opt UCLIBC_BUILD_NOW n
-	fi
-
-	restore_config .config
-
-	# setup build and run paths
-	local cross=${CTARGET}-
-	type -p ${cross}ar > /dev/null || cross=""
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
+src_configure() {
+	cp "${FILESDIR}"/uclibc.config .config
 	yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
-
-	cp .config myconfig
-
-	emake -s clean > /dev/null || die "could not clean"
 }
 
 src_compile() {
-	cp myconfig .config
-
 	emake headers || die "make headers failed"
-	just_headers && return 0
-
 	emake || die "make failed"
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		emake -C utils hostutils || die "make hostutils failed"
-	elif [[ ${CHOST} == *-uclibc* ]] ; then
-		emake utils || die "make utils failed"
-	fi
-}
-
-src_test() {
-	[[ ${CHOST} != ${CTARGET} ]] && return 0
-	[[ ${CBUILD} != ${CHOST} ]] && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	make UCLIBC_ONLY=1 check || die "test failed"
+	emake utils || die "make utils failed"
 }
 
 src_install() {
-	local sysroot=${D}
-	[[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die "install failed"
-
-	save_config .config
+	emake DESTDIR="${D}" install || die "install failed"
 
 	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if [[ ${CTARGET} != ${CHOST} ]] ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	if [[ ${CHOST} == *-uclibc* ]] ; then
-		emake DESTDIR="${D}" install_utils || die "install-utils failed"
-		dobin extra/scripts/getent
-	fi
+	rm -rf "${D}"/usr/include/{linux,asm*}
 
+	emake DESTDIR="${D}" install_utils || die "install-utils failed"
+	dobin extra/scripts/getent
 	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
 }
 
 pkg_postinst() {
-	[[ ${CTARGET} != ${CHOST} ]] && return 0
-	[[ ${CHOST} != *-uclibc* ]] && return 0
-
-	if [[ ! -e ${ROOT}/etc/TZ ]] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		[[ ! -d ${ROOT}/etc ]] && mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[[ ${ROOT} != "/" ]] && return 0
-	# update cache before reloading init
+	echo "UTC" > "${ROOT}"/etc/TZ
 	/sbin/ldconfig
-	# reload init ...
 	[[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
 }