commit: e31bea4612e174201032c496edc62b8e97109569 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Dec 29 13:49:59 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Dec 29 13:49:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31bea46
sys-devel/binutils-apple: patchbump for llvm 4/5 by Michael Weiser Closes: https://bugs.gentoo.org/642292 Package-Manager: Portage-2.3.13, Repoman-2.3.3 sys-devel/binutils-apple/Manifest | 1 + .../binutils-apple/binutils-apple-8.2.1-r1.ebuild | 366 +++++++++++++++++++++ 2 files changed, 367 insertions(+) diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest index 1818fa06667..f404c7a7bfb 100644 --- a/sys-devel/binutils-apple/Manifest +++ b/sys-devel/binutils-apple/Manifest @@ -8,6 +8,7 @@ DIST binutils-apple-patches-7.2-r0.tar.bz2 2917 BLAKE2B 53bf5c5c8a21bcaa4df6b1fe DIST binutils-apple-patches-7.3-r0.tar.bz2 44576 BLAKE2B a9f23fe66f9b3e25b8975c9148db996fb3133f70b11768fe400993c90d62b6da2c9704a99104c6921dfae5052b5e0d66bd1af02640df8166a957fef9a092d52a SHA512 6b092c586ac4c3a3c65229a7490f93b0f0d38348e5a2db4f73d6062c737007ee0a5b6bdb5948b7aac1d74d32442fa501ba92161a9ffe13151288432c6a706c43 DIST binutils-apple-patches-7.3-r1.tar.bz2 44737 BLAKE2B 4ac5d3b50c04b1ab71dc1c266db8b44e9d34f12bcc8a53966232cb5a6999b2662f9891367a2e7f8ea4f0f014b19594c1adf8dd945a18419980bca729c1de302e SHA512 ce4b3a725e19cb632b0c101a32488ce09a8bb89aed08339d5518d834cb68c525b2e0c8b66564a945c077915e92cc6be3f7028c5baacb870b3ca9b9422b4fb0da DIST binutils-apple-patches-8.2-r0.tar.bz2 5771 BLAKE2B b562ea4dd9214bc66695dbdb2452c88b1885ae1e36904516ea664157cbf0b54421d80cd0df792fcc431a3e0b98e804488c651b3fa29b368445450d0d13a1502c SHA512 92d04396630a31b752a24845c27fe8da2e37eb176117c9b31193e8f48af7ade707cda4060289b848965310afd05b2f121c740b0e5baa56b79c5481273a88c84e +DIST binutils-apple-patches-8.2-r1.tar.bz2 10830 BLAKE2B 345db8619873e9e91b79c3fdc0685fc46f82366df0b6153c1a59fbe5c122622e799754397e980e8752ef01ef25bbac81bb8f0339e92168790211b1d9c03bef2d SHA512 e7ca8cbac75671846c044abcd5415cfcf5832ff71acd5a2799b643369b02f2f7148990398c51913a3758e589f9fbff875e333aadf568e2a8a2defeafaa2aca95 DIST cctools-822.tar.gz 2024412 BLAKE2B 6b58499a9dfc2a1b166ff428f1e263cd44e03c50cdc8f6e467cfee93bc2dc2a9c81bf7626479dce195b152f04217e2d3a427afac45484cba4c5f2bdfbb7e46f9 SHA512 8b02cc837d5e0520f35da445f25ba86b5042d5caa27b49a599e829ed89428cf78dbd1831bcf6c18301f941fbfb31ac2114e248041d98008a466e1574f4fe1586 DIST cctools-855.tar.gz 1699635 BLAKE2B 4d98cf2bbced6894083dc2733a35cf9a4c47f71172fe98265a8f047218cc90276085919129553e3a1ea0658416eebf3b7cf0908bd32ac1a224480554257999ee SHA512 50f5d015ce807aa5ca274dd2deea810b8b375110e60b5e334ca4b2170526b738ea5f86a5436caebbdb748badc3b89601d0f450f5b867d8393c89e336a3db4b3f DIST cctools-862.tar.gz 1702345 BLAKE2B de84058aa78824562b0eabf93a29badaba0908a7140336a281a6ea46a9b09d893433a908c299e8de866a76e0eeb98b730570958fc8fac559ccc6e35f5138b121 SHA512 faa401c1dc55bfb9cd2a9a9cc7bc9d473ee63b019607967c8b0da325514d6a1f7b1f52404370bcc018e86d30d75a4b01183f49b793f577110663efe43871360a diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild new file mode 100644 index 00000000000..bf8351a7b24 --- /dev/null +++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils flag-o-matic toolchain-funcs llvm prefix + +LD64=ld64-274.2 +CCTOOLS_VERSION=895 +CCTOOLS=cctools-${CCTOOLS_VERSION} +DYLD=dyld-421.2 + +DESCRIPTION="Darwin assembler as(1) and static linker ld(1), Xcode Tools ${PV}" +HOMEPAGE="http://www.opensource.apple.com/darwinsource/"; +SRC_URI="http://www.opensource.apple.com/tarballs/ld64/${LD64}.tar.gz + http://www.opensource.apple.com/tarballs/cctools/${CCTOOLS}.tar.gz + http://www.opensource.apple.com/tarballs/dyld/${DYLD}.tar.gz + https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-4.3-r1.tar.bz2 + https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-5.1-r2.tar.bz2 + https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-7.3-r1.tar.bz2 + https://dev.gentoo.org/~grobian/distfiles/${PN}-patches-8.2-r1.tar.bz2"; + +LICENSE="APSL-2" +KEYWORDS="~x64-macos ~x86-macos" +IUSE="lto tapi classic test" + +# ld64 can now only be compiled using llvm and libc++ since it massively uses +# C++11 language features. *But additionally* the as driver now defaults to +# calling clang as the assembler on many platforms. This can be disabled using +# -Wa,-Q but since it's default we make llvm a static runtime dependency. +RDEPEND="sys-devel/binutils-config + lto? ( app-arch/xar ) + tapi? ( sys-libs/tapi ) + sys-devel/llvm + sys-libs/libcxx" +DEPEND="${RDEPEND} + test? ( >=dev-lang/perl-5.8.8 )" + +SLOT="8" + +S=${WORKDIR} + +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +llvm_pkg_setup() { + # eclass version will die if no LLVM can be found which will break prefix + # bootstrap + : +} + +src_prepare() { + cd "${S}"/${LD64}/src + cp "${S}"/ld64-136-compile_stubs.h ld/compile_stubs.h + cp "${S}"/ld64-274.2-Makefile Makefile + + epatch "${S}"/ld64-274.1-nolto.patch + epatch "${S}"/ld64-236.3-crashreporter.patch + epatch "${S}"/ld64-264.3.102-bitcode-case.patch + epatch "${S}"/ld64-274.1-unknown-fixup.patch + epatch "${S}"/ld64-274.1-notapi.patch + epatch "${S}"/ld64-274.2-cfi-info-type.patch + + # workound llvm-3.9.{0,1} issue + # https://bugs.gentoo.org/show_bug.cgi?id=603580 + # https://groups.google.com/forum/#!topic/llvm-dev/JY6nuKE__sU + # http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20160829/169553.html + sed -i -e '/COMPILE_TIME_ASSERT/d' ld/parsers/libunwind/*.hpp || die + + # provide missing headers from libunwind and dyld + mkdir -p include/{mach,mach-o/arm} || die + # never present because it's private + cp ../../${DYLD}/include/mach-o/dyld_priv.h include/mach-o || die + # use copies from cctools because they're otherwise hidden in some SDK + cp ../../${CCTOOLS}/include/mach-o/arm/reloc.h include/mach-o/arm || die + # provide all required CPU_TYPEs on all platforms + cp ../../${CCTOOLS}/include/mach/machine.h include/mach/machine.h + # add alias for newer identifiers, because ld64 uses both but cctools + # header only defines the older + epatch "${S}"/ld64-236.3-missing-cputypes.patch + + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + echo "char ldVersionString[] = ${VER_STR};" > version.cpp + + epatch "${S}"/ld64-123.2-debug-backtrace.patch + + cd "${S}"/${CCTOOLS} + epatch "${S}"/${PN}-4.5-as.patch + epatch "${S}"/${PN}-5.1-as-dir.patch + epatch "${S}"/${PN}-5.1-ranlib.patch + epatch "${S}"/${PN}-3.1.1-libtool-ranlib.patch + epatch "${S}"/${PN}-3.1.1-no-headers.patch + epatch "${S}"/${PN}-4.0-no-oss-dir.patch + epatch "${S}"/cctools-839-intel-retf.patch + epatch "${S}"/${PN}-5.1-extraneous-includes.patch + epatch "${S}"/${PN}-5.1-strnlen.patch + epatch "${S}"/${PN}-7.3-make-j.patch + epatch "${S}"/${PN}-7.3-no-developertools-dir.patch + epatch "${S}"/${PN}-8.2.1-llvm-prefix-3.patch + epatch "${S}"/${PN}-8.2.1-llvm-shim.patch + eprefixify libstuff/execute.c + cp ../${LD64}/src/other/prune_trie.h include/mach-o/ || die + + # do not build profileable libstuff to save compile time + sed -i -e "/^all:/s, profile , ," libstuff/Makefile + + # cctools version is provided to make via RC_ProjectSourceVersion which + # generates and compiles it as apple_version[] into libstuff. From + # there it's picked up by the individual tools. Since + # RC_ProjectSourceVersion is also used as library version, we can't + # just append our local version info. So we hack the libstuff Makefile + # to include our Gentoo version. + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + libstuff/Makefile + + eapply_user + + # clean up test suite + cd "${S}"/${LD64}/unit-tests/test-cases + local c + + # we don't have llvm + ((++c)); rm -rf llvm-integration; + + # we don't have dtrace + ((++c)); rm -rf dtrace-static-probes-coalescing; + ((++c)); rm -rf dtrace-static-probes; + + # a file is missing + ((++c)); rm -rf eh-coalescing-r + + # we don't do universal binaries + ((++c)); rm -rf blank-stubs; + + # looks like a problem with apple's result-filter.pl + ((++c)); rm -rf implicit-common3; + ((++c)); rm -rf order_file-ans; + + # TODO no idea what goes wrong here + ((++c)); rm -rf dwarf-debug-notes; + + einfo "Deleted $c tests that were bound to fail" + + cd "${S}" + ebegin "cleaning Makefiles from unwanted CFLAGS" + find . -name "Makefile" -print0 | xargs -0 sed \ + -i \ + -e 's/ -g / /g' \ + -e 's/^G =.*$/G =/' \ + -e 's/^OFLAG =.*$/OFLAG =/' \ + -e 's/install -c -s/install/g' + eend $? +} + +src_configure() { + ENABLE_LTO=0 + if use lto ; then + ENABLE_LTO=1 + + LLVM_INCDIR=$(get_llvm_prefix)/include + LLVM_LIBDIR=$(get_llvm_prefix)/lib + + [ -n "${LLVM_INCDIR}" -a -n "${LLVM_LIBDIR}" ] || \ + die "LLVM not found - LTO support can not be enabled" + + # LTO and LLVM support currently both depend only on libLTO being + # present. So we can enable both. + CCTOOLS_LTO_CFLAGS="-DLTO_SUPPORT -I${LLVM_INCDIR}" + CCTOOLS_LLVM_CFLAGS="-DLLVM_SUPPORT -I${LLVM_INCDIR}" + fi + + export CTARGET=${CTARGET:-${CHOST}} + if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi + fi + + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${PV} + else + BINPATH=/usr/${CTARGET}/binutils-bin/${PV} + fi + + # CPPFLAGS only affects ld64, cctools don't use 'em (which currently is + # what we want) + append-cppflags -DNDEBUG + + # Create configure.h for ld64 with SUPPORT_ARCH_<arch> defines in it. + DERIVED_FILE_DIR=${LD64}/src \ + ${LD64}/src/create_configure +} + +compile_ld64() { + einfo "building ${LD64}" + cd "${S}"/${LD64}/src + emake \ + LTO=${ENABLE_LTO} \ + LTO_INCDIR=${LLVM_INCDIR} \ + LTO_LIBDIR=${LLVM_LIBDIR} \ + TAPI=$(use tapi && echo 1 || echo 0) \ + TAPI_LIBDIR=${EPREFIX}/usr/lib \ + || die "emake failed for ld64" + use test && emake build_test +} + +compile_cctools() { + einfo "building ${CCTOOLS}" + cd "${S}"/${CCTOOLS} + # Suppress running dsymutil because it will warn about missing debug + # info which is expected when compiling without -g as we normally do. + # This might need some more thought if anyone ever wanted to build us + # for debugging with Apple's tools. + emake \ + LIB_PRUNETRIE="-L../../${LD64}/src -lprunetrie" \ + EFITOOLS= \ + LTO="${CCTOOLS_LTO_CFLAGS} ${CCTOOLS_LLVM_CFLAGS}" \ + COMMON_SUBDIRS='libstuff ar misc otool' \ + SUBDIRS_32= \ + LEGACY= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + DSYMUTIL=": disabled: dsymutil" \ + || die "emake failed for the cctools" + cd "${S}"/${CCTOOLS}/as + emake \ + BUILD_OBSOLETE_ARCH= \ + RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ + OFLAG="${CCTOOLS_OFLAG}" \ + DSYMUTIL=": disabled: dsymutil" \ + || die "emake failed for as" +} + +src_compile() { + compile_ld64 + compile_cctools +} + +install_ld64() { + exeinto ${BINPATH} + doexe "${S}"/${LD64}/src/{ld64,rebase,dyldinfo,unwinddump,ObjectDump} + dosym ld64 ${BINPATH}/ld + insinto ${DATAPATH}/man/man1 + doins "${S}"/${LD64}/doc/man/man1/{ld,ld64,rebase}.1 +} + +install_cctools() { + cd "${S}"/${CCTOOLS} + emake install_all_but_headers \ + EFITOOLS= \ + COMMON_SUBDIRS='ar misc otool' \ + SUBDIRS_32= \ + DSTROOT=\"${D}\" \ + BINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCBINDIR=\"${EPREFIX}\"${BINPATH} \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} \ + MANDIR=\"${EPREFIX}\"${DATAPATH}/man/ + cd "${S}"/${CCTOOLS}/as + emake install \ + BUILD_OBSOLETE_ARCH= \ + DSTROOT=\"${D}\" \ + USRBINDIR=\"${EPREFIX}\"${BINPATH} \ + LIBDIR=\"${EPREFIX}\"${LIBPATH} \ + LOCLIBDIR=\"${EPREFIX}\"${LIBPATH} + + # upstream is starting to replace classic binutils with llvm-integrated + # ones. In Xcode, nm and size are now symlinks to llvm-{nm,size} while the + # classic version is preserved as {nm,size}-classic. When asked to do so + # by use classic we statically link to the classic version. + # binutils-bin/<version>/<tool> + # -> binutils-bin/<version>/<tool>-classic + # + # Otherwise we try to find and use the llvm version of the tool. Since our + # binutils do not live in the same directory as the llvm installation and + # llvm tends to move around, we use a shim that tries to find the llvm + # version of the tool in prefix. It will fall back to the classic tool if + # it fails. + # binutils-bin/<version>/<tool> + # -> binutils-bin/<version>/llvm-<tool> + # -> $EPREFIX/usr/lib/llvm/<major/bin/llvm-<tool> + # -> $EPREFIX/usr/bin/llvm-<tool> + # -> binutils-bin/<version>/<tool>-classic + budir=${D}/${EPREFIX}/${BINPATH} + for tool in nm size ; do + use classic && \ + ln -sfn ${tool}-classic "${budir}/${tool}" || \ + ln -sfn llvm-shim "${budir}/${tool}" + done + + # Also, otool is now based on llvm-objdump. But a small wrapper installed + # as llvm-otool remains, providing command line compatibility. + use classic && \ + ln -sfn otool-classic "${budir}/otool" || \ + ln -sfn llvm-otool "${budir}/otool" + + # And finally, although our cctools don't actually contain dsymutil and + # objdump, we provide access to the llvm versions of them via the shim to + # be in line with Xcode. + for tool in objdump dsymutil ; do + ln -sfn llvm-shim "${budir}/${tool}" + done + + cd "${ED}"${BINPATH} + insinto ${DATAPATH}/man/man1 + local skips manpage + # ar brings an up-to-date manpage with it + skips=( ar ) + for bin in *; do + for skip in ${skips[@]}; do + if [[ ${bin} == ${skip} ]]; then + continue 2; + fi + done + manpage=${S}/${CCTOOLS}/man/${bin}.1 + if [[ -f "${manpage}" ]]; then + doins "${manpage}" + fi + done + insinto ${DATAPATH}/man/man5 + doins "${S}"/${CCTOOLS}/man/*.5 +} + +src_test() { + if ! [ "${EPREFIX}"/usr/bin/clang ] ; then + einfo "Test suite only works properly with clang - please install" + return + fi + + einfo "Running unit tests" + cd "${S}"/${LD64}/unit-tests/test-cases + # provide the new ld as a symlink to clang so that -ccc-install-dir + # will pick it up + ln -sfn ../../src/ld64 ld + # use our arch command because the System's will report i386 even for an + # x86_64 prefix + perl ../bin/make-recursive.pl \ + BUILT_PRODUCTS_DIR="${S}"/${LD64}/src \ + ARCH="$(arch)" \ + LD="${S}"/${LD64}/src/ld64 \ + CC="${CC} -ccc-install-dir $PWD" \ + CXX="${CXX} -ccc-install-dir $PWD" \ + OTOOL="${S}"/${CCTOOLS}/otool/otool.NEW \ + | perl ../bin/result-filter.pl +} + +src_install() { + install_ld64 + install_cctools + + cd "${S}" + insinto /etc/env.d/binutils + cat <<-EOF > env.d + TARGET="${CHOST}" + VER="${PV}" + FAKE_TARGETS="${CHOST}" + EOF + newins env.d ${CHOST}-${PV} +} + +pkg_postinst() { + binutils-config ${CHOST}-${PV} +}
