From: Ned Ludd Date: Mon, 15 Jan 2007 23:57:52 +0000 (+0000) Subject: - import readahead() symbol and import from Joakim Tjernlund - uClibc-svn-r17162... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b2799590989aa4b32e71da363f553ee4d2398c0;p=gentoo.git - import readahead() symbol and import from Joakim Tjernlund - uClibc-svn-r17162 (Support SecurePLTs for PowerPC) Package-Manager: portage-2.1.2_rc2-r4 --- diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog index ac5b411288b0..ce09883613b9 100644 --- a/sys-libs/uclibc/ChangeLog +++ b/sys-libs/uclibc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/uclibc -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.16 2006/10/14 04:50:10 vapier Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.17 2007/01/15 23:57:52 solar Exp $ + +*uclibc-0.9.28-r2 (15 Jan 2007) + + 15 Jan 2007; +uclibc-0.9.28-r2.ebuild: + - import readahead() symbol and import from Joakim Tjernlund - + uClibc-svn-r17162 (Support SecurePLTs for PowerPC) *uclibc-0.9.28-r1 (14 Oct 2006) diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest index 0ccad213c3de..aab69c5a27a7 100644 --- a/sys-libs/uclibc/Manifest +++ b/sys-libs/uclibc/Manifest @@ -1,11 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST uClibc-0.9.27-cvs-update-20050114.patch.bz2 839 RMD160 08439855b6dc481216132d3882b8f634ecbe4555 SHA1 0e1a400745f0cbd739c6c08f45951eea836b1102 SHA256 83b86570ed0f0109f2ff04e753daf18a9bf59eab5b01b8d04a2406bb4100c423 DIST uClibc-0.9.27-patches-1.6.tar.bz2 24001 RMD160 eca81853e00e5144c165b2eb4733059d53f93234 SHA1 93beb60660145c1b661c577f1e89a7217841c0c9 SHA256 78ff8162423b5563b1a97ae5294ab1e919b9489e171962053da54c04ee127797 DIST uClibc-0.9.27.tar.bz2 1693895 RMD160 4c580c0c468bcd7e77a6b4223847f17b6ad241cc SHA1 e0de53949998253e25e6b946b564062babb723b4 SHA256 d43098b9d1cac5cc983672f885d82b59459c3abcb12ef8141653581c77cd0d9c DIST uClibc-0.9.28-patches-1.3.tar.bz2 22522 RMD160 f12b3f4b3131a4a76767b089f1b813182192f8e5 SHA1 948558b10df5c7ce295ef8bfad4f13aa91fafb70 SHA256 362047c2773ad2e328dfd59e0033f5fc111afc571c34c2de90a822616fc29a9b DIST uClibc-0.9.28-patches-1.6.tar.bz2 28097 RMD160 b171d9e20fd80550e4aca83fbc1bf781c58823ca SHA1 1dd0976281aaeec82ace1f0c20bd4d0cf65201ba SHA256 4b3e78582e836bd06fc7bbf1e1a0e6cd9037a8b06746e14b87006654c266631e +DIST uClibc-0.9.28-patches-1.7.tar.bz2 31188 RMD160 aab3e3cc52c22b88b477259aa1b162755df24ae4 SHA1 e47dac600ace9128a728cb1486d64fc564da6cc7 SHA256 331dc7ee32eede26f72c1af564f22d99d8d7f1902dbee85fa778e779d0747e55 DIST uClibc-0.9.28.tar.bz2 1763847 RMD160 41646bd94459a9c6f10aea4a4483fa4fedf30e7d SHA1 9124a6e5b0454da3f967725d54fde806189ad27b SHA256 c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57 EBUILD uclibc-0.9.27-r1.ebuild 12097 RMD160 3816b31a3525fe14d3800482919955fe0ee560b7 SHA1 a656858817952fdbd7875a0aa03a4f2c34795e1f SHA256 d45688369afe23adbb50740d8135577cbef2a5d36ef16eee077688e40b57e427 @@ -16,14 +14,18 @@ EBUILD uclibc-0.9.28-r1.ebuild 13993 RMD160 9782b9076a4908e5e50faea2baffae7746cb MD5 7ada8c2dc3206036e8a2e11d8af5aa21 uclibc-0.9.28-r1.ebuild 13993 RMD160 9782b9076a4908e5e50faea2baffae7746cb3953 uclibc-0.9.28-r1.ebuild 13993 SHA256 3991dd534afe1d7a6d307c7c6f508d4f290e242783a77dd89f9a9e5097402d5a uclibc-0.9.28-r1.ebuild 13993 +EBUILD uclibc-0.9.28-r2.ebuild 13993 RMD160 ea2b7f314b0185d7e32ffddcacbce745f8f0e83a SHA1 06658d96689da83c7f66ce9329dd3e08a33239db SHA256 be96f9c4cc9a839fd151ccf80453c3d80572e5d0c67afc60c49030a554baf599 +MD5 7506152bef7ecee0a24bf562299ffa9f uclibc-0.9.28-r2.ebuild 13993 +RMD160 ea2b7f314b0185d7e32ffddcacbce745f8f0e83a uclibc-0.9.28-r2.ebuild 13993 +SHA256 be96f9c4cc9a839fd151ccf80453c3d80572e5d0c67afc60c49030a554baf599 uclibc-0.9.28-r2.ebuild 13993 EBUILD uclibc-0.9.28.ebuild 13987 RMD160 8392b6b8534d27e02674b1a31bd104eff32dc3bf SHA1 78d7abbeab2d86782e859ee20dd3ddfe5cae6f81 SHA256 64d88508c47f31f7cef520e42832e79353bac3163eca4826fadfe2559750f423 MD5 a82bb403afd9e8d48b2fd6ffd4564ee6 uclibc-0.9.28.ebuild 13987 RMD160 8392b6b8534d27e02674b1a31bd104eff32dc3bf uclibc-0.9.28.ebuild 13987 SHA256 64d88508c47f31f7cef520e42832e79353bac3163eca4826fadfe2559750f423 uclibc-0.9.28.ebuild 13987 -MISC ChangeLog 10220 RMD160 c63b5edb4604180857d65cd11513d53fbf35de47 SHA1 62a4b27d36ed3e06ce70f0b388ed2071f4832d69 SHA256 37602cffffd9b4fc1c6923ae58fe15aa4300fce04b1155a32a46449128c234a4 -MD5 aeb3bab51b3a78d6b7e2b358069692b3 ChangeLog 10220 -RMD160 c63b5edb4604180857d65cd11513d53fbf35de47 ChangeLog 10220 -SHA256 37602cffffd9b4fc1c6923ae58fe15aa4300fce04b1155a32a46449128c234a4 ChangeLog 10220 +MISC ChangeLog 10431 RMD160 e199106374dd507e5968887a399f4b37dfdbd01a SHA1 6f4d6bd95708b5b680d025e0bdfc49238c3f4fc6 SHA256 3fae6090cd35d5ff791414037bb2ad696e2b043eee912abd4b69b75ca46fda31 +MD5 e16fa6a7d86675e764cb413009cb6214 ChangeLog 10431 +RMD160 e199106374dd507e5968887a399f4b37dfdbd01a ChangeLog 10431 +SHA256 3fae6090cd35d5ff791414037bb2ad696e2b043eee912abd4b69b75ca46fda31 ChangeLog 10431 MISC metadata.xml 999 RMD160 8367607c1e522c03d21a0f0ce68b316d42bd08cb SHA1 0433f3a405603e702c155ec67f67cb95bf628a1c SHA256 0be91c12da3e7c119ee885d360c0e983a69f0141614902bb2de6c54c08d4c56c MD5 e96b4dfc373a1cdf7735aeae52c4cf7e metadata.xml 999 RMD160 8367607c1e522c03d21a0f0ce68b316d42bd08cb metadata.xml 999 @@ -37,10 +39,6 @@ SHA256 80090a14aee6fedbe96a78f31486641b1460175f8756845c8973389552b4e2f5 files/di MD5 e0efbe886e65855653c33f5925c2f94b files/digest-uclibc-0.9.28-r1 777 RMD160 87153a2d7329890a0203a0ef1951e31718a4308f files/digest-uclibc-0.9.28-r1 777 SHA256 9e196587e5f64bc3a864e42cbae4bf09eee3daf6b1793fbfdbd012f2cb793138 files/digest-uclibc-0.9.28-r1 777 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFoNJl8bi6rjpTunYRAo4NAJ4sss6ikEQO2NzJEt8koU4DKruOzwCg0Z6f -hx6YFU1z1wS4UUD55QPBzmc= -=oOLQ ------END PGP SIGNATURE----- +MD5 d4ce9549c6e80d6dcc9119016e42d836 files/digest-uclibc-0.9.28-r2 777 +RMD160 53894c09efe1b2322005418f9c7cc52663606e9a files/digest-uclibc-0.9.28-r2 777 +SHA256 be46d5d046c8d03c95eaadd3ab8ae6fddb65837b2ed811168f889aee985874c1 files/digest-uclibc-0.9.28-r2 777 diff --git a/sys-libs/uclibc/files/digest-uclibc-0.9.28-r2 b/sys-libs/uclibc/files/digest-uclibc-0.9.28-r2 new file mode 100644 index 000000000000..364bae3d36e4 --- /dev/null +++ b/sys-libs/uclibc/files/digest-uclibc-0.9.28-r2 @@ -0,0 +1,9 @@ +MD5 b89d3b4aa438537f435218e7f0220054 uClibc-0.9.28-patches-1.7.tar.bz2 31188 +RMD160 aab3e3cc52c22b88b477259aa1b162755df24ae4 uClibc-0.9.28-patches-1.7.tar.bz2 31188 +SHA256 331dc7ee32eede26f72c1af564f22d99d8d7f1902dbee85fa778e779d0747e55 uClibc-0.9.28-patches-1.7.tar.bz2 31188 +MD5 1ada58d919a82561061e4741fb6abd29 uClibc-0.9.28.tar.bz2 1763847 +RMD160 41646bd94459a9c6f10aea4a4483fa4fedf30e7d uClibc-0.9.28.tar.bz2 1763847 +SHA256 c8bc5383eafaa299e9874ae50acc6549f8b54bc29ed64a9a3387b3e4cd7f4bcb uClibc-0.9.28.tar.bz2 1763847 +MD5 d75b2239b4e27c3c9cbed1c8f6eabba6 uClibc-locale-030818.tgz 236073 +RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 uClibc-locale-030818.tgz 236073 +SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57 uClibc-locale-030818.tgz 236073 diff --git a/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild b/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild new file mode 100644 index 000000000000..fa78308b936d --- /dev/null +++ b/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild @@ -0,0 +1,448 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28-r2.ebuild,v 1.1 2007/01/15 23:57:52 solar Exp $ + +#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" +#inherit subversion +inherit eutils flag-o-matic toolchain-funcs + +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 + +MY_P=uClibc-${PV} +SVN_VER="" +PATCH_VER="1.7" +DESCRIPTION="C library for developing embedded Linux systems" +HOMEPAGE="http://www.uclibc.org/" +SRC_URI="http://www.kernel.org/pub/linux/libs/uclibc/${MY_P}.tar.bz2 + nls? ( !userlocales? ( pregen? ( + x86? ( http://www.uclibc.org/downloads/uClibc-locale-030818.tgz ) + ) ) )" +[[ -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" +[[ ${CTARGET} != ${CHOST} ]] \ + && SLOT="${CTARGET}" \ + || SLOT="0" +KEYWORDS="-* ~arm ~m68k -mips ~ppc ~sh ~sparc x86" +IUSE="build uclibc-compat debug hardened iconv ipv6 minimal nls pregen savedconfig userlocales wordexp" +RESTRICT="nostrip" + +RDEPEND="" +if [[ ${CTARGET} == ${CHOST} ]] ; then + DEPEND="virtual/os-headers app-misc/pax-utils" + PROVIDE="virtual/libc" +else + DEPEND="" +fi + +S=${WORKDIR}/${MY_P} + +alt_build_kprefix() { + if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \ + || [[ -n ${UCLIBC_AND_GLIBC} ]] + then + echo /usr + else + echo /usr/${CTARGET}/usr + fi +} +just_headers() { + use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] +} + +uclibc_endian() { + printf "#include \n#if __BYTE_ORDER == __LITTLE_ENDIAN\nlittle\n#else\nbig\n#endif\n" \ + | $(tc-getCPP) - \ + | tail -n 1 +} + +pkg_setup() { + just_headers && return 0 + has_version ${CATEGORY}/uclibc || return 0 + [[ -n ${UCLIBC_AND_GLIBC} ]] && return 0 + [[ ${ROOT} != "/" ]] && return 0 + + if ! built_with_use ${CATEGORY}/uclibc nls && use nls && ! use pregen ; then + eerror "You previously built uclibc with USE=-nls." + eerror "You cannot generate locale data with this" + eerror "system. Please rerun emerge with USE=pregen." + die "host cannot support locales" + elif built_with_use ${CATEGORY}/uclibc nls && ! use nls ; then + eerror "You previously built uclibc with USE=nls." + eerror "Rebuilding uClibc with USE=-nls will prob" + eerror "destroy your system." + die "switching from nls is baaaad" + fi +} + +PIE_STABLE="arm mips ppc x86" + +CPU_ALPHA="" +CPU_AMD64="" +CPU_ARM="GENERIC_ARM ARM{610,710,720T,920T,922T,926T,_{SA110,SA1100,XSCALE}}" +CPU_IA64="" +CPU_M68K="" +CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}}" +CPU_PPC="" +CPU_SH="SH{2,3,4,5}" +CPU_SPARC="" +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 +} + +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 + # math functions (sinf,cosf,tanf,atan2f,powf,fabsf,copysignf,scalbnf,rem_pio2f) + cp "${WORKDIR}"/patch/math/libm/* "${S}"/libm/ || die + epatch "${WORKDIR}"/patch/math + fi + + ########## 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";; + 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 TARGET_i386:default TARGET_${target}:" \ + extra/Configs/Config.in + sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ + extra/Configs/Config.${target} + + ########## CONFIG SETUP ########## + + make defconfig >/dev/null || die "could not config" + + for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} ; do + sed -i -e "s:${def}=y:# ${def} is not set:" .config + done + if use debug ; then + #echo "SUPPORT_LD_DEBUG_EARLY=y" >> .config + echo "SUPPORT_LD_DEBUG=y" >> .config + echo "DODEBUG=y" >> .config + #echo "DODEBUG_PT=y" >> .config + fi + + sed -i -e '/ARCH_.*_ENDIAN/d' .config + echo "ARCH_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN=y" >> .config + + if [[ ${CTARGET//_/-} == *-softfloat-* ]] ; then + sed -i -e '/^HAS_FPU=y$/d' .config + echo 'HAS_FPU=n' >> .config + fi + + local moredefs="DL_FINI_CRT_COMPAT" + # We need todo this for a few months. .28 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 __uClibc_start_main symbol" + fnames=$(scanelf -pyqs__uClibc_start_main -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 ${fnames}" + echo + ewarn "Leaving on ${moredefs}" + fi + else + moredefs="" + fi + fi + for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} ; do + sed -i -e "s:# ${def} is not set:${def}=y:" .config + done + echo "UCLIBC_HAS_FULL_RPC=y" >> .config + echo "PTHREADS_DEBUG_SUPPORT=y" >> .config + echo "UCLIBC_HAS_TZ_FILE_READ_MANY=n" >> .config + + if use iconv ; then + sed -i -e "s:# UCLIBC_HAS_LOCALE is not set:UCLIBC_HAS_LOCALE=y:" .config + echo "UCLIBC_HAS_XLOCALE=n" >> .config + echo "UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y" >> .config + echo "UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y" >> .config + + if use nls ; then + echo "UCLIBC_HAS_GETTEXT_AWARENESS=y" >> .config + else + echo "UCLIBC_HAS_GETTEXT_AWARENESS=n" >> .config + fi + + if use pregen ; then + echo "UCLIBC_PREGENERATED_LOCALE_DATA=y" >> .config + echo "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y" >> .config + if use userlocales ; then + cp "${DISTDIR}"/${MY_P}-user-locale.tar.gz \ + extra/locale/uClibc-locale-030818.tgz \ + || die "could not copy ${MY_P}-user-locale.tar.gz" + else + cp "${DISTDIR}"/${MY_P}-$(tc-arch)-full-locale.tar.gz \ + extra/locale/uClibc-locale-030818.tgz \ + || die "could not copy locale" + fi + else + echo "UCLIBC_PREGENERATED_LOCALE_DATA=n" >> .config + fi + else + echo "UCLIBC_HAS_LOCALE=n" >> .config + fi + + use ipv6 && sed -i -e "s:# UCLIBC_HAS_IPV6 is not set:UCLIBC_HAS_IPV6=y:" .config + + # uncomment if you miss wordexp (alsa-lib) + use wordexp && sed -i -e "s:# UCLIBC_HAS_WORDEXP is not set:UCLIBC_HAS_WORDEXP=y:" .config + + # we need to do it independently of hardened to get ssp.c built into libc + sed -i -e "s:# UCLIBC_SECURITY.*:UCLIBC_SECURITY=y:" .config + echo "UCLIBC_HAS_SSP=y" >> .config + echo "SSP_USE_ERANDOM=n" >> .config + echo "PROPOLICE_BLOCK_ABRT=n" >> .config + if use debug ; then + echo "PROPOLICE_BLOCK_SEGV=y" >> .config + echo "PROPOLICE_BLOCK_KILL=n" >> .config + else + echo "PROPOLICE_BLOCK_SEGV=n" >> .config + echo "PROPOLICE_BLOCK_KILL=y" >> .config + fi + + # 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 + # relro could be also moved out of hardened + if has $(tc-arch) x86 ; then + echo "UCLIBC_BUILD_NOEXECSTACK=y" >> .config + else + echo "UCLIBC_BUILD_NOEXECSTACK=n" >> .config + fi + echo "UCLIBC_BUILD_RELRO=y" >> .config + if use hardened ; then + if has $(tc-arch) ${PIE_STABLE} ; then + echo "UCLIBC_BUILD_PIE=y" >> .config + else + echo "UCLIBC_BUILD_PIE=n" >> .config + fi + echo "SSP_QUICK_CANARY=n" >> .config + echo "UCLIBC_BUILD_SSP=y" >> .config + echo "UCLIBC_BUILD_NOW=y" >> .config + else + echo "UCLIBC_BUILD_PIE=n" >> .config + echo "SSP_QUICK_CANARY=y" >> .config + echo "UCLIBC_BUILD_SSP=n" >> .config + echo "UCLIBC_BUILD_NOW=n" >> .config + fi + + # Allow users some custom control over the config + if use savedconfig ; then + for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do + configfile=${ROOT}/etc/${PN}/${CTARGET}/${conf}.config + einfo "Checking existence of ${configfile} ..." + [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config + if [[ -r ${configfile} ]] ; then + cp "${configfile}" "${S}"/.config + einfo "Found your ${configfile} and using it." + einfo "Note that this feature is *totally unsupported*." + break + fi + done + fi + + # 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_SOURCE/s:=.*:=\"$(alt_build_kprefix)\":" \ + -e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \ + -e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \ + -e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \ + .config || die + + 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" +} + +setup_locales() { + cd "${S}"/extra/locale + if use userlocales && [[ -f ${ROOT}/etc/locales.build ]] ; then + :; + elif use minimal ; then + find ./charmaps -name ASCII.pairs > codesets.txt + find ./charmaps -name ISO-8859-1.pairs >> codesets.txt + cat <<-EOF > locales.txt + @euro e + UTF-8 yes + 8-bit yes + en_US ISO-8859-1 + en_US.UTF-8 UTF-8 + EOF + else + find ./charmaps -name '*.pairs' > codesets.txt + cp LOCALES locales.txt + fi + cd - +} + +src_compile() { + cp myconfig .config + + emake headers || die "make headers failed" + just_headers && return 0 + + if use iconv && ! use pregen ; then + cd extra/locale + make clean || die "make locale clean failed" + setup_locales + emake || die "make locales failed" + cd ../.. + fi + + emake || die "make failed" + [[ ${CTARGET} != ${CHOST} ]] && return 0 + + if [[ ${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" +} + +src_install() { + local sysroot=${D} + [[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}" + + local target="install" + just_headers && target="install_dev" + make DESTDIR="${sysroot}" ${target} || 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 + return 0 + fi + + if [[ ${CHOST} == *-uclibc ]] ; then + make DESTDIR="${D}" install_utils || die "install-utils failed" + dobin extra/scripts/getent + fi + + if ! use build ; then + dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 + doman docs/man/*.[1-9] + fi +} + +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 + + if [[ ${ROOT} == "/" ]] ; then + # update cache before reloading init + /sbin/ldconfig + # reload init ... + [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null + fi +}