From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-411080-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RdAhv-0005yj-Jy
for garchives@archives.gentoo.org; Wed, 21 Dec 2011 01:10:59 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2EFC721C025;
Wed, 21 Dec 2011 01:10:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E1E7221C025
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Dec 2011 01:10:48 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 268561B401B
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Dec 2011 01:10:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 3DBBF80042
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Dec 2011 01:10:47 +0000 (UTC)
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" <blueness@gentoo.org>
Message-ID: <aef3365ff1ae4b40ea0d342e0bdace003c5b234c.blueness@gentoo>
Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/
X-VCS-Repository: proj/hardened-dev
X-VCS-Files: sys-libs/uclibc/ChangeLog sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild sys-libs/uclibc/uclibc-0.9.32-r1.ebuild sys-libs/uclibc/uclibc-0.9.32.ebuild
X-VCS-Directories: sys-libs/uclibc/ sys-libs/uclibc/files/
X-VCS-Committer: blueness
X-VCS-Committer-Name: Anthony G. Basile
X-VCS-Revision: aef3365ff1ae4b40ea0d342e0bdace003c5b234c
Date: Wed, 21 Dec 2011 01:10:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: fc078a7d-8a72-4077-b049-cd7bfdd47f8c
X-Archives-Hash: d80ceb3e9b6f58bf9c23bb543c208fe6
commit: aef3365ff1ae4b40ea0d342e0bdace003c5b234c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 01:10:30 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 01:10:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.=
git;a=3Dcommit;h=3Daef3365f
Fix __libc_epoll_pwait compile failure on x86
(Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)
---
sys-libs/uclibc/ChangeLog | 3 +
.../uclibc/files/uclibc-0.9.32-fix_epoll.patch | 42 +++
sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild | 380 --------------=
------
...clibc-0.9.32.ebuild =3D> uclibc-0.9.32-r1.ebuild} | 0
sys-libs/uclibc/uclibc-0.9.32.ebuild | 1 +
5 files changed, 46 insertions(+), 380 deletions(-)
diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index 362aeef..d4c9ae9 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,5 +1,8 @@
=20
=20
+ 21 Dec 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+ Fix __libc_epoll_pwait compile failure on x86
+
20 Dec 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
Added patch from bug #308477
=20
diff --git a/sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch b/sys-li=
bs/uclibc/files/uclibc-0.9.32-fix_epoll.patch
new file mode 100644
index 0000000..6e32d38
--- /dev/null
+++ b/sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch
@@ -0,0 +1,42 @@
+From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001
+From: Phil Blundell <pb@pbcl.net>
+Date: Sat, 11 Jun 2011 05:10:46 +0000
+Subject: Fix __libc_epoll_pwait compile failure on x86
+
+This prevents "memory input 7 is not directly addressable" errors.
+
+| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
+| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not =
directly addressable
+| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not =
directly addressable
+| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
+| make: *** Waiting for unfinished jobs....
+
+Signed-off-by: Phil Blundell <pb@pbcl.net>
+Signed-off-by: Jason Woodward <jason.woodward@timesys.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+(limited to 'libc/sysdeps/linux/common/epoll.c')
+
+diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/comm=
on/epoll.c
+index 85b0cfd..ab3e73b 100644
+--- a/libc/sysdeps/linux/common/epoll.c
++++ b/libc/sysdeps/linux/common/epoll.c
+@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
+ int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxeve=
nts,
+ int timeout, const sigset_t *set)
+ {
++ int nsig =3D _NSIG / 8;
+ if (SINGLE_THREAD_P)
+- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeou=
t, set, _NSIG / 8);
++ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeou=
t, set, nsig);
+ # ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ else {
+ int oldtype =3D LIBC_CANCEL_ASYNC ();
+- int result =3D INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents=
, timeout, set, _NSIG / 8);
++ int result =3D INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents=
, timeout, set, nsig);
+ LIBC_CANCEL_RESET (oldtype);
+ return result;
+ }
+--
+cgit v0.9.0.1-2-gef13
+
diff --git a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild b/sys-libs/uclibc/=
uclibc-0.9.30.1-r1.ebuild
deleted file mode 100644
index ad1e4d3..0000000
--- a/sys-libs/uclibc/uclibc-0.9.30.1-r1.ebuild
+++ /dev/null
@@ -1,380 +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.eb=
uild,v 1.9 2011/04/20 18:10:38 ulm Exp $
-
-#ESVN_REPO_URI=3D"svn://uclibc.org/trunk/uClibc"
-#inherit subversion
-inherit eutils flag-o-matic toolchain-funcs savedconfig
-
-export CBUILD=3D${CBUILD:-${CHOST}}
-export CTARGET=3D${CTARGET:-${CHOST}}
-if [[ ${CTARGET} =3D=3D ${CHOST} ]] ; then
- if [[ ${CATEGORY/cross-} !=3D ${CATEGORY} ]] ; then
- export CTARGET=3D${CATEGORY/cross-}
- fi
-fi
-# Handle the case where we want uclibc on glibc ...
-if [[ ${CTARGET} =3D=3D ${CHOST} ]] && [[ ${CHOST} !=3D *-uclibc* ]] ; t=
hen
- export UCLIBC_AND_GLIBC=3D"sitting in a tree"
- export CTARGET=3D${CHOST%%-*}-pc-linux-uclibc
-fi
-
-MY_P=3DuClibc-0.9.30.1
-SVN_VER=3D""
-PATCH_VER=3D"1.0"
-DESCRIPTION=3D"C library for developing embedded Linux systems"
-HOMEPAGE=3D"http://www.uclibc.org/"
-SRC_URI=3D"http://uclibc.org/downloads/${MY_P}.tar.bz2"
-
-[[ -z ${SVN_VER} ]] || \
- SRC_URI=3D"${SRC_URI} mirror://gentoo/${MY_P}-svn-update-${SVN_VER}.pat=
ch.bz2"
-[[ -z ${PATCH_VER} ]] || \
- SRC_URI=3D"${SRC_URI} mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.=
bz2"
-
-LICENSE=3D"LGPL-2"
-SLOT=3D"0"
-KEYWORDS=3D"-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-IUSE=3D"build uclibc-compat debug hardened ssp ipv6 minimal wordexp cros=
scompile_opts_headers-only"
-RESTRICT=3D"strip"
-
-RDEPEND=3D""
-if [[ -n $CTARGET && ${CTARGET} !=3D ${CHOST} ]]; then
- DEPEND=3D""
- SLOT=3D"${CTARGET}"
-else
- DEPEND=3D"virtual/os-headers app-misc/pax-utils"
- SLOT=3D"0"
-fi
-
-S=3D${WORKDIR}/${MY_P}
-
-alt_build_kprefix() {
- if [[ ${CBUILD} =3D=3D ${CHOST} && ${CTARGET} =3D=3D ${CHOST} ]] \
- || [[ -n ${UCLIBC_AND_GLIBC} ]]
- then
- echo /usr/include
- else
- echo /usr/${CTARGET}/usr/include
- fi
-}
-
-just_headers() {
- use crosscompile_opts_headers-only && [[ ${CHOST} !=3D ${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} !=3D "/" ]] && return 0
- [[ ${CATEGORY} =3D=3D cross-* ]] && return 0
-
-}
-
-PIE_STABLE=3D"arm mips ppc x86"
-
-CPU_ALPHA=3D""
-CPU_AMD64=3D""
-CPU_ARM=3D"GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_=
S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT}}"
-CPU_IA64=3D""
-CPU_M68K=3D""
-CPU_MIPS=3D"MIPS_ISA_{1,2,3,4,MIPS{32,64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=3D""
-CPU_SH=3D"SH{2,3,4,5}"
-CPU_SPARC=3D"SPARC_V{7,8,9,9B}"
-CPU_X86=3D"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=3D"${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPA=
RC} ${CPU_X86}"
-
-check_cpu_opts() {
- local cpu_var=3D"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=3D$(eval echo ${!cpu_var})
- echo ${UCLIBC_CPU}
- case ${CTARGET} in
- mips[1234]*) export UCLIBC_CPU=3D"MIPS_ISA_${CTARGET:4:1}";;
- sh[2345]*) export UCLIBC_CPU=3D"SH${CTARGET:2:1}";;
- i[456]86*) export UCLIBC_CPU=3D"${CTARGET:1:1}86";;
- *) export UCLIBC_CPU=3D${UCLIBC_CPU%% *};;
- esac
- else
- local cpu found=3D0
- for cpu in $(eval echo ${!cpu_var}) ; do
- [[ ${UCLIBC_CPU} =3D=3D "${cpu}" ]] && found=3D1 && 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=3D.*/d" .config
- echo "$1=3D$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=3D"patch"
- epatch "${WORKDIR}"/patch
- fi
-
- sed -i 's:getline:get_line:' extra/scripts/unifdef.c #277186
-
- ########## CPU SELECTION ##########
-
- local target config_target
- case $(tc-arch) in
- alpha) target=3D"alpha"; config_target=3D"no cpu-specific options";;
- amd64) target=3D"x86_64"; config_target=3D"no cpu-specific options";;
- arm) target=3D"arm"; config_target=3D"GENERIC_ARM";;
- avr) target=3D"avr32"; config_target=3D"no cpu-specific options";;
- ia64) target=3D"ia64"; config_target=3D"no cpu-specific options";;
- m68k) target=3D"m68k"; config_target=3D"no cpu-specific options";;
- mips) target=3D"mips"; config_target=3D"MIPS_ISA_1";;
- ppc) target=3D"powerpc"; config_target=3D"no cpu-specific options";;
- sh) target=3D"sh"; config_target=3D"SH4";;
- sparc) target=3D"sparc"; config_target=3D"no cpu-specific options";;
- x86) target=3D"i386"; config_target=3D"GENERIC_386";;
- *) die "$(tc-arch) lists no defaults :/";;
- esac
- sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CP=
U:-${config_target}}:" \
- extra/Configs/Config.${target}
- sed -i -e "s:^HOSTCC.*=3D.*:HOSTCC=3D$(tc-getBUILD_CC):" Rules.mak
-
- ########## CONFIG SETUP ##########
-
- make ARCH=3D${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}=3Dy:# ${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) !=3D "no" ]] ; then
- set_opt UCLIBC_HAS_FPU n
- fi
-
- if [[ ${CTARGET/eabi} !=3D ${CTARGET} ]] ; then
- set_opt CONFIG_ARM_OABI n
- set_opt CONFIG_ARM_EABI y
- fi
-
- local moredefs=3D"COMPAT_ATEXIT"
- local compat_sym=3Datexit
-
- # 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} =3D=3D ${CTARGET} ]] ; then
- local fnames=3D""
- einfo "Doing a scanelf in paths for bins containing the ${compat_sym}=
symbol"
- fnames=3D$(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=3D1"
- moredefs=3D""
- else
- ewarn "You need to remerge the packages that contain the following f=
iles before you can remerge ${P} without USE=3Duclibc-compat enabled."
- ewarn "qfile -Cq $(echo ${fnames}) | sort | uniq"
- echo
- ewarn "Leaving on ${moredefs}"
- fi
- else
- moredefs=3D""
- 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_REENTR=
ANT_RPC UCLIBC_HAS_GNU_GLOB PTHREADS_DEBUG_SUPPORT UCLIBC_HAS_TZ_FILE_RE=
AD_MANY UCLIBC_HAS_FENV UCLIBC_SUSV3_LEGACY UCLIBC_SUSV3_LEGACY_MACROS UC=
LIBC_HAS_PROGRAM_INVOCATION_NAME ; do
- set_opt "${def}" y
- done
- set_opt UCLIBC_HAS_CTYPE_UNSAFE n
- set_opt UCLIBC_HAS_LOCALE n
-
- 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 li=
bc
- 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=3D${CTARGET}-
- type -p ${cross}ar > /dev/null || cross=3D""
- sed -i \
- -e "/^CROSS_COMPILER_PREFIX/s:=3D.*:=3D\"${cross}\":" \
- -e "/^KERNEL_HEADERS/s:=3D.*:=3D\"$(alt_build_kprefix)\":" \
- -e "/^SHARED_LIB_LOADER_PREFIX/s:=3D.*:=3D\"/$(get_libdir)\":" \
- -e "/^DEVEL_PREFIX/s:=3D.*:=3D\"/usr\":" \
- -e "/^RUNTIME_PREFIX/s:=3D.*:=3D\"/\":" \
- -e "/^UCLIBC_EXTRA_CFLAGS/s:=3D.*:=3D\"${UCLIBC_EXTRA_CFLAGS}\":" \
- .config || die
-
- yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not m=
ake 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} !=3D ${CHOST} ]] ; then
- emake -C utils hostutils || die "make hostutils failed"
- elif [[ ${CHOST} =3D=3D *-uclibc* ]] ; then
- emake utils || die "make utils failed"
- fi
-}
-
-src_test() {
- [[ ${CHOST} !=3D ${CTARGET} ]] && return 0
- [[ ${CBUILD} !=3D ${CHOST} ]] && return 0
-
- # assert test fails on pax/grsec enabled kernels - normal
- # vfork test fails in sandbox (both glibc/uclibc)
- make UCLIBC_ONLY=3D1 check || die "test failed"
-}
-
-src_install() {
- local sysroot=3D${D}
- [[ ${CHOST} !=3D ${CTARGET} ]] && sysroot=3D"${sysroot}/usr/${CTARGET}"
-
- local target=3D"install"
- just_headers && target=3D"install_headers"
- emake DESTDIR=3D"${sysroot}" ${target} || die "install failed"
-
- save_config .config
-
- # 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} !=3D ${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} =3D=3D *-uclibc* ]] ; then
- emake DESTDIR=3D"${D}" install_utils || die "install-utils failed"
- dobin extra/scripts/getent
- fi
-
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
- [[ ${CTARGET} !=3D ${CHOST} ]] && return 0
- [[ ${CHOST} !=3D *-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} !=3D "/" ]] && return 0
- # update cache before reloading init
- /sbin/ldconfig
- # reload init ...
- [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
-}
diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclib=
c-0.9.32-r1.ebuild
similarity index 100%
copy from sys-libs/uclibc/uclibc-0.9.32.ebuild
copy to sys-libs/uclibc/uclibc-0.9.32-r1.ebuild
diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclib=
c-0.9.32.ebuild
index 105174c..3cdf287 100644
--- a/sys-libs/uclibc/uclibc-0.9.32.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.32.ebuild
@@ -171,6 +171,7 @@ src_unpack() {
fi
=20
epatch "${FILESDIR}"/${P}-BJA-sandbox.patch
+ epatch "${FILESDIR}"/${P}-fix_epoll.patch
=20
########## CPU SELECTION ##########
=20