Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/
Date: Mon, 02 Jan 2012 23:22:11
Message-Id: 4a0cfb3192584c87d42da9c8bde46c44b41769be.blueness@gentoo
1 commit: 4a0cfb3192584c87d42da9c8bde46c44b41769be
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 23:21:54 2012 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 23:21:54 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=4a0cfb31
7
8 sys-libs/uclibc: removed 0.9.32
9
10 ---
11 .../uclibc/files/uclibc-0.9.32-BJA-sandbox.patch | 9 ---
12 .../uclibc/files/uclibc-0.9.32-fix_epoll.patch | 42 ---------------
13 sys-libs/uclibc/uclibc-0.9.32.ebuild | 56 --------------------
14 3 files changed, 0 insertions(+), 107 deletions(-)
15
16 diff --git a/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch b/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch
17 deleted file mode 100644
18 index 167d711..0000000
19 --- a/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch
20 +++ /dev/null
21 @@ -1,9 +0,0 @@
22 ---- ./libubacktrace/Makefile.in.ori 2011-07-25 19:14:19.427297221 +0200
23 -+++ ./libubacktrace/Makefile.in 2011-07-25 19:14:34.380349907 +0200
24 -@@ -71,5 +71,4 @@
25 - $(do_ar)
26 -
27 - CLEAN_libubacktrace:
28 -- $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) \
29 -- $(addprefix $(libubacktrace_ARCH_OUT)/*., o os oS a)
30 -+ $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a)
31
32 diff --git a/sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch b/sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch
33 deleted file mode 100644
34 index 6e32d38..0000000
35 --- a/sys-libs/uclibc/files/uclibc-0.9.32-fix_epoll.patch
36 +++ /dev/null
37 @@ -1,42 +0,0 @@
38 -From 8245f3b4638fdff2011c2657af1bb211def704bc Mon Sep 17 00:00:00 2001
39 -From: Phil Blundell <pb@××××.net>
40 -Date: Sat, 11 Jun 2011 05:10:46 +0000
41 -Subject: Fix __libc_epoll_pwait compile failure on x86
42 -
43 -This prevents "memory input 7 is not directly addressable" errors.
44 -
45 -| libc/sysdeps/linux/common/epoll.c: In function '__libc_epoll_pwait':
46 -| libc/sysdeps/linux/common/epoll.c:71:80: error: memory input 7 is not directly addressable
47 -| libc/sysdeps/linux/common/epoll.c:75:86: error: memory input 7 is not directly addressable
48 -| make: *** [libc/sysdeps/linux/common/epoll.o] Error 1
49 -| make: *** Waiting for unfinished jobs....
50 -
51 -Signed-off-by: Phil Blundell <pb@××××.net>
52 -Signed-off-by: Jason Woodward <jason.woodward@×××××××.com>
53 -Signed-off-by: Khem Raj <raj.khem@×××××.com>
54 ----
55 -(limited to 'libc/sysdeps/linux/common/epoll.c')
56 -
57 -diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
58 -index 85b0cfd..ab3e73b 100644
59 ---- a/libc/sysdeps/linux/common/epoll.c
60 -+++ b/libc/sysdeps/linux/common/epoll.c
61 -@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
62 - int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
63 - int timeout, const sigset_t *set)
64 - {
65 -+ int nsig = _NSIG / 8;
66 - if (SINGLE_THREAD_P)
67 -- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
68 -+ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
69 - # ifdef __UCLIBC_HAS_THREADS_NATIVE__
70 - else {
71 - int oldtype = LIBC_CANCEL_ASYNC ();
72 -- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
73 -+ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
74 - LIBC_CANCEL_RESET (oldtype);
75 - return result;
76 - }
77 ---
78 -cgit v0.9.0.1-2-gef13
79 -
80
81 diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclibc-0.9.32.ebuild
82 deleted file mode 100644
83 index b15d322..0000000
84 --- a/sys-libs/uclibc/uclibc-0.9.32.ebuild
85 +++ /dev/null
86 @@ -1,56 +0,0 @@
87 -# Copyright 1999-2011 Gentoo Foundation
88 -# Distributed under the terms of the GNU General Public License v2
89 -# $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 $
90 -
91 -EAPI="4"
92 -
93 -inherit eutils
94 -
95 -MY_P=uClibc-0.9.32
96 -DESCRIPTION="C library for developing embedded Linux systems"
97 -HOMEPAGE="http://www.uclibc.org/"
98 -SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2"
99 -
100 -LICENSE="LGPL-2"
101 -SLOT="0"
102 -KEYWORDS="-* amd64 x86"
103 -IUSE=""
104 -RESTRICT="strip"
105 -
106 -RDEPEND=""
107 -DEPEND=""
108 -
109 -S=${WORKDIR}/${MY_P}
110 -
111 -src_prepare() {
112 - epatch "${FILESDIR}"/${P}-BJA-sandbox.patch
113 - epatch "${FILESDIR}"/${P}-fix_epoll.patch
114 -}
115 -
116 -src_configure() {
117 - cp "${FILESDIR}"/uclibc.config .config
118 - yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig"
119 -}
120 -
121 -src_compile() {
122 - emake headers || die "make headers failed"
123 - emake || die "make failed"
124 - emake utils || die "make utils failed"
125 -}
126 -
127 -src_install() {
128 - emake DESTDIR="${D}" install || die "install failed"
129 -
130 - # remove files coming from kernel-headers
131 - rm -rf "${D}"/usr/include/{linux,asm*}
132 -
133 - emake DESTDIR="${D}" install_utils || die "install-utils failed"
134 - dobin extra/scripts/getent
135 - dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
136 -}
137 -
138 -pkg_postinst() {
139 - echo "UTC" > "${ROOT}"/etc/TZ
140 - /sbin/ldconfig
141 - [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null
142 -}