diff options
author | Bertrand Jacquin <beber@meleeweb.net> | 2013-05-27 22:47:11 +0200 |
---|---|---|
committer | Bertrand Jacquin <beber@meleeweb.net> | 2013-05-27 23:01:33 +0200 |
commit | 98704b5ac105433d9e89c1d90b1336b27e23e9f3 (patch) | |
tree | f57aa360ec513a06073140efa868022e4ba9263c /sys-libs | |
parent | sys-libs/uclibc++: update to 0.2.4 (diff) | |
download | portage-98704b5ac105433d9e89c1d90b1336b27e23e9f3.tar.xz |
sys-libs/uclibc: newer release fix for getline()
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/uclibc/Manifest | 9 | ||||
-rw-r--r-- | sys-libs/uclibc/files/039132.html | 97 | ||||
-rw-r--r-- | sys-libs/uclibc/files/49e81cada73616864b9b31df0aeb6961c30f5a6e.diff | 37 | ||||
-rw-r--r-- | sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.diff | 9 | ||||
-rw-r--r-- | sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild | 461 | ||||
-rw-r--r-- | sys-libs/uclibc/uclibc-0.9.32.ebuild | 383 |
6 files changed, 0 insertions, 996 deletions
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest deleted file mode 100644 index a7b5a52f..00000000 --- a/sys-libs/uclibc/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX 039132.html 2512 RMD160 5c8348ce4360782f07bee66bb145fa64e0227a55 SHA1 594f663a749a08813a36137337bea7eabb8f8d7d SHA256 a828d0a7a2ec69e2a0a15e7bc9d5a5a9ff91d39db18d3576ecd40a16e0dbdcf3 -AUX 49e81cada73616864b9b31df0aeb6961c30f5a6e.diff 1130 RMD160 1e7088d588dacdc23d9ed5a0947390d6caccf1e2 SHA1 b136419a5db96946d012279015f85cd63ecd6426 SHA256 3cc7b7ee043bbeced8d6f56f0adf7ebf82575c7d9ae53692f113ffd4c3c4cef2 -AUX uclibc-0.9.32-BJA-sandbox.diff 369 RMD160 eb69d8813be34edc9e7e0714551b5e3264219d37 SHA1 761ddfd185e118873f446ad9c8d4bf3447943da9 SHA256 1d31852f9e0871a215df783416ca8fad2f3039152349478f90e953370ab4456b -DIST uClibc-0.9.28.3-patches-1.8.tar.bz2 27909 RMD160 7c936749075162939c76489aa5a88278f235b48f SHA1 5bb582cb8f95407bd9fa938a9dd09027dcf0db0b SHA256 9496394de9de241551497c496b7fb8ece32b23536485bd81bd20128c2e104790 -DIST uClibc-0.9.28.3.tar.bz2 1795383 RMD160 61591281f4193d4dcd0fa3252fb3286028d4cb63 SHA1 77c5220697a1772d0d9da4bda0d866e4f4b68540 SHA256 1d86d5dad6060e7057cfe023ffc7b7661bdc7fe95112b37447851c0a75b547a1 -DIST uClibc-0.9.32.tar.bz2 2796416 RMD160 0d3e2acc8cd609283e331bb914abd610a0c65ec7 SHA1 f8edc4ffcd9e8d1e8ae5348b9b879f5175010e67 SHA256 23c133f788cbb55ef526793a25deeda8216e833fb93cc6fb9ab0b4b7991d8e28 -DIST uClibc-locale-030818.tgz 236073 RMD160 8e3f4b20b94e07e535cbbbe81287186014c5f151 SHA1 78f901e6ed228ed84106bd034c1b97eee1eecb50 SHA256 c4362be318a38f18d98dccf462d22d95bab92f05548bb93f65298fe9afaebd57 -EBUILD uclibc-0.9.28.3-r7.ebuild 14556 RMD160 9336488c8700f9b2d7990229d72ddb101d924c98 SHA1 4dfaa50a8736995e054babdeaf31ddb6797ecbf7 SHA256 91afa4f966d3453290d5659b1cbcd0dc7712cac26d3908bffefb4fc275676aee -EBUILD uclibc-0.9.32.ebuild 11708 RMD160 59880097543699167ea611a25ac35188798814de SHA1 7522cfe3a73bba961be246d935fc6a5aafa5f5f3 SHA256 6f5426a15c6ddc5e66b5f6a02e0806582031d84f32e92f219d82a5f600d7e0d3 diff --git a/sys-libs/uclibc/files/039132.html b/sys-libs/uclibc/files/039132.html deleted file mode 100644 index a97af5ec..00000000 --- a/sys-libs/uclibc/files/039132.html +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naur a/librt/Makefile b/librt/Makefile ---- a/librt/Makefile 2005-08-18 00:49:48.000000000 +0200 -+++ b/librt/Makefile 2006-11-30 09:33:25.000000000 +0100 -@@ -14,7 +14,8 @@ - CSRC=mq_open.c mq_close.c mq_unlink.c mq_getsetattr.c \ - mq_send.c mq_receive.c mq_notify.c \ - timer_create.c timer_delete.c \ -- timer_settime.c timer_gettime.c timer_getoverr.c -+ timer_settime.c timer_gettime.c timer_getoverr.c \ -+ shm_open.c shm_unlink.c - OBJS=$(patsubst %.c,%.o, $(CSRC)) - - all: $(LIBRT) -diff -Naur a/librt/shm_open.c b/librt/shm_open.c ---- a/librt/shm_open.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/librt/shm_open.c 2006-11-30 08:41:35.000000000 +0100 -@@ -0,0 +1,48 @@ -+/* shm_open - open a shared memory file */ -+ -+/* Copyright 2002, Red Hat Inc. */ -+ -+#include <sys/types.h> -+#include <sys/mman.h> -+#include <unistd.h> -+#include <string.h> -+#include <fcntl.h> -+#include <limits.h> -+ -+int -+shm_open (const char *name, int oflag, mode_t mode) -+{ -+ int fd; -+ char shm_name[PATH_MAX+20] = "/dev/shm/"; -+ -+ /* skip opening slash */ -+ if (*name == '/') -+ ++name; -+ -+ /* create special shared memory file name and leave enough space to -+ cause a path/name error if name is too long */ -+ strlcpy (shm_name + 9, name, PATH_MAX + 10); -+ -+ fd = open (shm_name, oflag, mode); -+ -+ if (fd != -1) -+ { -+ /* once open we must add FD_CLOEXEC flag to file descriptor */ -+ int flags = fcntl (fd, F_GETFD, 0); -+ -+ if (flags >= 0) -+ { -+ flags |= FD_CLOEXEC; -+ flags = fcntl (fd, F_SETFD, flags); -+ } -+ -+ /* on failure, just close file and give up */ -+ if (flags == -1) -+ { -+ close (fd); -+ fd = -1; -+ } -+ } -+ -+ return fd; -+} -diff -Naur a/librt/shm_unlink.c b/librt/shm_unlink.c ---- a/librt/shm_unlink.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/librt/shm_unlink.c 2006-11-30 08:41:35.000000000 +0100 -@@ -0,0 +1,28 @@ -+/* shm_unlink - remove a shared memory file */ -+ -+/* Copyright 2002, Red Hat Inc. */ -+ -+#include <sys/types.h> -+#include <sys/mman.h> -+#include <unistd.h> -+#include <string.h> -+#include <limits.h> -+ -+int -+shm_unlink (const char *name) -+{ -+ int rc; -+ char shm_name[PATH_MAX+20] = "/dev/shm/"; -+ -+ /* skip opening slash */ -+ if (*name == '/') -+ ++name; -+ -+ /* create special shared memory file name and leave enough space to -+ cause a path/name error if name is too long */ -+ strlcpy (shm_name + 9, name, PATH_MAX + 10); -+ -+ rc = unlink (shm_name); -+ -+ return rc; -+} diff --git a/sys-libs/uclibc/files/49e81cada73616864b9b31df0aeb6961c30f5a6e.diff b/sys-libs/uclibc/files/49e81cada73616864b9b31df0aeb6961c30f5a6e.diff deleted file mode 100644 index 46908ba4..00000000 --- a/sys-libs/uclibc/files/49e81cada73616864b9b31df0aeb6961c30f5a6e.diff +++ /dev/null @@ -1,37 +0,0 @@ -From 49e81cada73616864b9b31df0aeb6961c30f5a6e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 06 Apr 2009 06:40:57 +0000 -Subject: apply getline() fix from linux kernel - ---- -diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c -index 0eb0d09..5d1171e 100644 ---- extra/scripts/unifdef.c -+++ extra/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -517,7 +517,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -531,7 +531,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; diff --git a/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.diff b/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.diff deleted file mode 100644 index 167d7119..00000000 --- a/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- ./libubacktrace/Makefile.in.ori 2011-07-25 19:14:19.427297221 +0200 -+++ ./libubacktrace/Makefile.in 2011-07-25 19:14:34.380349907 +0200 -@@ -71,5 +71,4 @@ - $(do_ar) - - CLEAN_libubacktrace: -- $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) \ -- $(addprefix $(libubacktrace_ARCH_OUT)/*., o os oS a) -+ $(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) diff --git a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild b/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild deleted file mode 100644 index e2b64881..00000000 --- a/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild +++ /dev/null @@ -1,461 +0,0 @@ -# Copyright 1999-2009 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.3-r7.ebuild,v 1.4 2009/03/03 21:28:05 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.8" -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="http://www.uclibc.org/" -SRC_URI="mirror://kernel/linux/libs/uclibc/${MY_P}.tar.bz2 - http://uclibc.org/downloads/${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 crosscompile_opts_headers-only" -RESTRICT="strip" - -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() { - # 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 - - if ! built_with_use --missing false ${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 --missing false ${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 - - epatch "${FILESDIR}"/039132.html - - ########## 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 [[ $(tc-is-softfloat) != "no" ]] ; 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" - 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" -} - -src_install() { - local sysroot=${D} - [[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}" - - local target="install" - just_headers && target="install_dev" - emake 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 - if ! just_headers ; 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 - - dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 - doman docs/man/*.[1-9] -} - -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 -} diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclibc-0.9.32.ebuild deleted file mode 100644 index ac248d76..00000000 --- a/sys-libs/uclibc/uclibc-0.9.32.ebuild +++ /dev/null @@ -1,383 +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 $ - -#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" -#inherit subversion -inherit eutils flag-o-matic toolchain-funcs savedconfig - -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-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 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" -IUSE="build uclibc-compat debug hardened ssp ipv6 minimal nptl wordexp crosscompile_opts_headers-only" -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 - -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 - - epatch "${FILESDIR}"/${P}-BJA-sandbox.diff - - ########## 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 - - 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" -} - -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 - - # 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 - - 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 - /sbin/ldconfig - # reload init ... - [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null -} |