From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDA07139085 for ; Wed, 11 Jan 2017 20:58:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F4D92340FE; Wed, 11 Jan 2017 20:58:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2E1E2340FE for ; Wed, 11 Jan 2017 20:58:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE7553415D2 for ; Wed, 11 Jan 2017 20:58:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E81312519 for ; Wed, 11 Jan 2017 20:58:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1484167887.8f4ae8558247f281be5822d913ff3c89ec204468.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/klibc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/klibc/klibc-2.0.4-r1.ebuild X-VCS-Directories: dev-libs/klibc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8f4ae8558247f281be5822d913ff3c89ec204468 X-VCS-Branch: master Date: Wed, 11 Jan 2017 20:58:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3017deeb-87c6-4160-8a4c-3ba3c8314652 X-Archives-Hash: 6464c014bb42db189c68a5ad68c5dccd commit: 8f4ae8558247f281be5822d913ff3c89ec204468 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 11 20:49:17 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 11 20:51:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4ae855 dev-libs/klibc: Drop broken ebuild Package-Manager: portage-2.3.0 dev-libs/klibc/klibc-2.0.4-r1.ebuild | 317 ----------------------------------- 1 file changed, 317 deletions(-) diff --git a/dev-libs/klibc/klibc-2.0.4-r1.ebuild b/dev-libs/klibc/klibc-2.0.4-r1.ebuild deleted file mode 100644 index 702d35e..00000000 --- a/dev-libs/klibc/klibc-2.0.4-r1.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Robin H. Johnson , 12 Nov 2007: -# This still needs major work. -# But it is significently better than the previous version. -# In that it will now build on biarch systems, such as ppc64-32ul. - -# NOTES: -# ====== -# We need to bring in the kernel sources seperately -# Because they have to be configured in a way that differs from the copy in -# /usr/src/. The sys-kernel/linux-headers are too stripped down to use -# unfortunately. -# This will be able to go away once the klibc author updates his code -# to build again the headers provided by the kernel's 'headers_install' target. - -EAPI=6 -K_TARBALL_SUFFIX="xz" - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="A minimal libc subset for use with initramfs" -HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc/ https://www.kernel.org/pub/linux/libs/klibc/" -KV_MAJOR="4" KV_MINOR="x" KV_SUB="4" -PKV_EXTRA="" -if [[ ${PKV_EXTRA} ]]; then - if [[ ${KV_MAJOR} == 2 ]]; then - PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" - else - PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" - fi - PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}" -fi -if [[ ${KV_MAJOR} == 2 ]]; then - OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}" -else - OKV="${KV_MAJOR}.${KV_SUB}" -fi -KERNEL_URI=" - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX} - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}" -DEBIAN_PV=2.0.4 -DEBIAN_PR=9 -DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz" -SRC_URI=" - mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX} - mirror://debian/pool/main/k/klibc/${DEBIAN_A} - ${PATCH_URI} - ${KERNEL_URI}" - -LICENSE="|| ( GPL-2 LGPL-2 )" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86" -SLOT="0" -IUSE="debug test custom-cflags" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" - -KS="${WORKDIR}/linux-${OKV}" - -# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot -QA_EXECSTACK="*" -# Do not strip -RESTRICT="strip" - -kernel_asm_arch() { - a="${1:${ARCH}}" - case ${a} in - # Merged arches - x86) echo i386 ;; # for build on x86 userspace & 64bit kernel - amd64) echo x86 ;; - ppc*) echo powerpc ;; - # Non-merged - alpha|arm|arm64|ia64|m68k|mips|sh|sparc*) echo ${1} ;; - *) die "TODO: Update the code for your asm-ARCH symlink" ;; - esac -} - -# For a given Gentoo ARCH, -# specify the kernel defconfig most relevant -kernel_defconfig() { - a="${1:${ARCH}}" - # most, but not all arches have a sanely named defconfig - case ${a} in - ppc64) echo ppc64_defconfig ;; - ppc) echo pmac32_defconfig ;; - sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;; - *) echo defconfig ;; - esac -} - -src_unpack() { - unpack linux-${OKV}.tar.${K_TARBALL_SUFFIX} ${P}.tar.${K_TARBALL_SUFFIX} ${DEBIAN_A} -} - -PATCHES=( - # Build interp.o with EXTRA_KLIBCAFLAGS (.S source) - "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch - # Fix usage of -s, bug #201006 - "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch - # The inline definition from sys/stat.h does not seem to get used - # So just copy it to make this compile for now - "${FILESDIR}"/klibc-2.0.2-mkfifo.patch - # Newer kernels have some headers in the uapi dir - "${FILESDIR}"/klibc-2.0.3-kernel-uapi.patch -) - -src_prepare() { - [[ ${PKV} ]] && EPATCH_OPTS="-d ${KS} -p1" eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX} - - # Symlink /usr/src/linux to ${S}/linux - ln -snf "${KS}" linux - #ln -snf "/usr" linux - - # Borrow the debian fixes too - for p in $(<"${WORKDIR}"/debian/patches/series) ; do - PATCHES+=( "${WORKDIR}/debian/patches/${p}" ) - done - - default -} - -# klibc has it's own ideas of arches -# They reflect userspace strictly. -# This functions maps from a Gentoo ARCH, to an arch that klibc expects -# Look at klibc-${S}/usr/klibc/arch for a list of these arches -klibc_arch() { - a="${1:${ARCH}}" - case ${a} in - amd64) echo x86_64;; - mips) die 'TODO: Use the $ABI' ;; - x86) echo i386;; - *) echo ${a} ;; - esac -} - -src_compile() { - local myargs="all" - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - LD="$(tc-getLD)" - HOSTCC="$(tc-getBUILD_CC)" - HOSTLD="$(tc-getBUILD_LD)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - cd "${KS}" - emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig" - if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \ - [[ "${CHOST/eabi}" != "${CHOST}" ]]; then - # The delete and insert are seperate statements - # so that they are reliably used. - sed -i \ - -e '/CONFIG_AEABI/d' \ - -e '1iCONFIG_AEABI=y' \ - -e '/CONFIG_OABI_COMPAT/d' \ - -e '1iCONFIG_OABI_COMPAT=y' \ - -e '1iCONFIG_ARM_UNWIND=y' \ - "${KS}"/.config \ - "${S}"/defconfig - fi - emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage" - - cd "${S}" - - use debug && myargs="${myargs} V=1" - use test && myargs="${myargs} test" - append-ldflags -z noexecstack - append-flags -nostdlib - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z noexecstack" \ - HOSTLDFLAGS="-z noexecstack" \ - KLIBCOPTFLAGS='-nostdlib' \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - HOSTLD="${HOSTLD}" LD="${LD}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - T="${T}" \ - $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ - $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ - $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} || die "Compile failed!" - - #SHLIBDIR="/${libdir}" \ - - ARCH="${myARCH}" ABI="${myABI}" -} - -src_install() { - local myargs - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - HOSTCC="$(tc-getBUILD_CC)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - - use debug && myargs="${myargs} V=1" - - local klibc_prefix - if tc-is-cross-compiler ; then - klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix) - else - klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix) - fi - - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z noexecstack" \ - HOSTLDFLAGS="-z noexecstack" \ - KLIBCOPTFLAGS='-nostdlib' \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - HOSTLD="${HOSTLD}" LD="${LD}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - INSTALLROOT="${D}" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - T="${T}" \ - $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ - $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ - $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} \ - install || die "Install failed!" - - #SHLIBDIR="/${libdir}" \ - - # klibc doesn't support prelinking, so we need to mask it - cat > "${T}/70klibc" <<-EOF - PRELINK_PATH_MASK="/usr/${libdir}/klibc" - EOF - - doenvd "${T}"/70klibc - - # Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include - # Actually I have no idea, why the includes have those weird-ass permissions - # on a particular system, might be due to inherited permissions from parent - # directory - find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX - find "${D}"/usr/${libdir}/klibc/include -type f \ - \( -name '.install' -o -name '..install.cmd' \) -delete || die - - # Hardlinks becoming copies - for x in gunzip zcat ; do - rm -f "${D}/${klibc_prefix}/bin/${x}" - dosym gzip "${klibc_prefix}/bin/${x}" - done - - # Restore now, so we can use the tc- functions - ARCH="${myARCH}" ABI="${myABI}" - if ! tc-is-cross-compiler ; then - cd "${S}" - insinto /usr/share/aclocal - doins contrib/klibc.m4 - - dodoc README usr/klibc/CAVEATS - docinto gzip; dodoc usr/gzip/README - fi - - # Fix up the symlink - # Mainly for merged arches - linkname="${D}/usr/${libdir}/klibc/include/asm" - if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then - ln -snf asm-${KLIBCASMARCH} "${linkname}" - fi -} - -src_test() { - if ! tc-is-cross-compiler ; then - cd "${S}"/usr/klibc/tests - ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')" - BROKEN_TESTS="fcntl fnmatch testrand48" - failed=0 - for t in $ALL_TESTS ; do - if has $t $BROKEN_TESTS ; then - echo "=== $t SKIP" - else - echo -n "=== $t " - ./$t /dev/null - rc=$? - if [ $rc -eq 0 ]; then - echo PASS - else - echo FAIL - failed=1 - fi - fi - done - [ $failed -ne 0 ] && die "Some tests failed." - fi -}