Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 255239 Details for
Bug 336830
dev-libs/klibc fails to build with make 3.82
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
patched ebuild to include fix for build with infinite loop
klibc-1.5.20.ebuild (text/plain), 8.13 KB, created by
Marko D
on 2010-11-23 21:19:46 UTC
(
hide
)
Description:
patched ebuild to include fix for build with infinite loop
Filename:
MIME Type:
Creator:
Marko D
Created:
2010-11-23 21:19:46 UTC
Size:
8.13 KB
patch
obsolete
># Copyright 1999-2010 Gentoo Foundation ># Distributed under the terms of the GNU General Public License v2 ># $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.5.15-r1.ebuild,v 1.3 2010/01/10 09:50:36 robbat2 Exp $ > ># Robin H. Johnson <robbat2@gentoo.org>, 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 ># unfortunetly. ># 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. > >inherit eutils multilib toolchain-funcs > >DESCRIPTION="A minimal libc subset for use with initramfs." >HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc" >KV_MAJOR="2" KV_MINOR="6" KV_SUB="36" >PKV_EXTRA="" >if [ -n "${PKV_EXTRA}" ]; then > PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" > PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2" >fi >OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}" >KERNEL_URI=" > mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2 > mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2" >SRC_URI=" > mirror://kernel/linux/libs/klibc/Current/${P}.tar.bz2 > mirror://kernel/linux/libs/klibc/Testing/${P}.tar.bz2 > ${PATCH_URI} > ${KERNEL_URI}" > >LICENSE="|| ( GPL-2 LGPL-2 )" >KEYWORDS="~amd64 -mips ~ppc ~sparc ~x86 ~arm" >SLOT="0" >IUSE="debug n32" > >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|amd64) echo x86 ;; > ppc*) echo powerpc ;; > # Non-merged > alpha|arm|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.bz2 ${P}.tar.bz2 > [ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2 > cd "${S}" > echo "current dir is $PWD" > # Symlink /usr/src/linux to ${S}/linux > ln -snf "${KS}" linux > #ln -snf "/usr" linux > > # Build interp.o with EXTRA_KLIBCAFLAGS (.S source) > epatch "${FILESDIR}"/${PN}-1.4.11-interp-flags.patch > > # Fixes for sparc and ppc > #epatch "${FILESDIR}"/${PN}-1.5-sigaction.patch > > # Fix the asm-ppc vs. asm-powerpc issue, bug #196521 > #epatch "${FILESDIR}"/${PN}-1.5.11-klibcasmarch.patch > > # Fix usage of -s, bug #201006 > epatch "${FILESDIR}"/klibc-1.5.7-strip-fix-dash-s.patch > > # bug 229525, usr/include/arch/x86_64/sys/io.h has undefined variables > #epatch "${FILESDIR}"/${PN}-1.5.11-x86_64-io.h-return.diff > > > # fix infinite loop during build with make 3.82 > # http://www.zytor.com/pipermail/klibc/2010-November/002786.html > epatch "${FILESDIR}"/klibc-1.5.20-kbuild.patch > >} > ># 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)" > 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}) > echo "zzzzzz defconfig $defconfig" > 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}" || 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' \ > "${KS}"/.config \ > "${S}"/defconfig > fi > emake prepare CC="${CC}" HOSTCC="${HOSTCC}" || die "Failed to prepare kernel sources for header usage" > > cd "${S}" > > use debug && myargs="${myargs} V=1" > use test && myargs="${myargs} test" > > emake \ > EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ > EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ > HOSTCC="${HOSTCC}" CC="${CC}" \ > INSTALLDIR="/usr/${libdir}/klibc" \ > KLIBCARCH=${KLIBCARCH} \ > KLIBCASMARCH=${KLIBCASMARCH} \ > SHLIBDIR="/${libdir}" \ > libdir="/usr/${libdir}" \ > mandir="/usr/share/man" \ > T="${T}" \ > ${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" \ > HOSTCC="${HOSTCC}" CC="${CC}" \ > INSTALLDIR="/usr/${libdir}/klibc" \ > INSTALLROOT="${D}" \ > KLIBCARCH=${KLIBCARCH} \ > KLIBCASMARCH=${KLIBCASMARCH} \ > SHLIBDIR="/${libdir}" \ > libdir="/usr/${libdir}" \ > mandir="/usr/share/man" \ > ${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 > > # 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 usr/klibc/README > newdoc usr/klibc/arch/README README.klibc.arch > docinto dash; newdoc usr/dash/README.klibc README > 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="idtest 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 >/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 >}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 336830
:
246858
|
251893
| 255239 |
255241