diff options
Diffstat (limited to 'sys-devel')
96 files changed, 2581 insertions, 2873 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 07118b5042b0..078dd110f516 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest index 117401c7b3c1..e3680aa29422 100644 --- a/sys-devel/autoconf-wrapper/Manifest +++ b/sys-devel/autoconf-wrapper/Manifest @@ -1,3 +1,5 @@ AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7 +AUX ac-wrapper-14_pre2.sh 5099 BLAKE2B 2c5561f5ddde45c2eba8e2fbdd17ba9f33140bc160048a3266c8da03de86fec5418509b48b49abf58a9f4d9028ac0a2a21b0ce4fbddfe2bb32cd4a1ec5ff22f9 SHA512 4396019ec735893cb60bc79a172a27cb9bfb942ea0c96d1a3d7364c3b9cace49757913af173370826e4809bac80397a38be67cad80b3670f02f74b45cc480323 EBUILD autoconf-wrapper-13-r1.ebuild 816 BLAKE2B a5b0e9c7047aee1614b6af4ddd0d82307af513fb56ce0b2256234eb268a184afd7cb1129b5521a8b03fd1936505e951f89e9a2b33763689cd68d38353e1a9cd3 SHA512 cd35df1e8a453812f738ec7820862815fbb7124eb85ee95b5aa3b93185ac395193aec23ea3f1d540da25a84630347a69a975c918fb85c0d8118ad2f3059ca08a +EBUILD autoconf-wrapper-14_pre2.ebuild 854 BLAKE2B 5a5b2a6dff654e10fff1477922395b074728d15ec0f9e139230935646bf3b600d73873cb24311d36609db1171e444b8dd0a3358c953f17968a23ef21acf4c33c SHA512 0eda50d8bdd3c8500de6c7cf759b9d20ed4c55215bf97414a7693e3063649878f8117d14e615fb595845e95cf676b477005ae9aa3a4e0f181993892d7f4c1cdf MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild new file mode 100644 index 000000000000..f2ed66df32cd --- /dev/null +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" == *_pre* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +S="${WORKDIR}" + +src_install() { + exeinto /usr/$(get_libdir)/misc + newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh + + dodir /usr/bin + local x= + for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do + dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} + done +} diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh new file mode 100644 index 000000000000..b414cf348339 --- /dev/null +++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre2.sh @@ -0,0 +1,203 @@ +#!/bin/sh +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Based on the ac-wrapper.pl script provided by MandrakeSoft +# Rewritten in bash by Gregorio Guidi +# +# Executes the correct autoconf version. +# +# - defaults to newest version available (hopefully autoconf-2.60) +# - runs autoconf 2.13 if: +# - envvar WANT_AUTOCONF is set to `2.1' +# -or- +# - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher) +# -or- +# - `configure' is already present and was generated by autoconf 2.13 + +warn() { printf "ac-wrapper: $*\n" 1>&2; } +err() { warn "$@"; exit 1; } +unset IFS +which() { + local p + IFS=: # we don't use IFS anywhere, so don't bother saving/restoring + for p in ${PATH} ; do + p="${p}/$1" + [ -e "${p}" ] && echo "${p}" && return 0 + done + unset IFS + return 1 +} + +# +# Sanitize argv[0] since it isn't always a full path #385201 +# +argv0=${0##*/} +case ${0} in + ${argv0}) + # find it in PATH + if ! full_argv0=$(which "${argv0}") ; then + err "could not locate ${argv0}; file a bug" + fi + ;; + *) + # re-use full/relative paths + full_argv0=$0 + ;; +esac + +if [ "${argv0}" = "ac-wrapper.sh" ] ; then + err "Don't call this script directly" +fi + +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then + err "Autoconf 2.13 doesn't contain autom4te.\n" \ + " Either unset WANT_AUTOCONF or don't execute anything\n" \ + " that would use autom4te." +fi + +if ! seq 0 0 2>/dev/null 1>&2 ; then #338518 + seq() { + local f l i + case $# in + 1) f=1 i=1 l=$1;; + 2) f=$1 i=1 l=$2;; + 3) f=$1 i=$2 l=$3;; + esac + while :; do + [ $l -lt $f -a $i -gt 0 ] && break + [ $f -lt $l -a $i -lt 0 ] && break + echo $f + : $(( f += i )) + done + return 0 + } +fi + +# +# Set up bindings between actual version and WANT_AUTOCONF; +# Start at last known unstable/stable versions to speed up lookup process. +# +if [ -z "${KNOWN_AUTOCONF}" ] ; then + KNOWN_AUTOCONF="2.70_beta3:2.5 2.69:2.5" +fi +vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1" + +binary="" +for v in ${vers} ; do + auto_ver=${v%:*} + if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then + binary="${full_argv0}-${auto_ver}" + break + fi +done +if [ -z "${binary}" ] ; then + err "Unable to locate any usuable version of autoconf.\n" \ + "\tI tried these versions: ${vers}\n" \ + "\tWith a base name of '${full_argv0}'." +fi + +# +# Check the WANT_AUTOCONF setting. We accept a whitespace delimited +# list of autoconf versions. +# +if [ -n "${WANT_AUTOCONF}" ] ; then + for v in ${vers} x ; do + if [ "${v}" = "x" ] ; then + warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring." + unset WANT_AUTOCONF + break + fi + + auto_ver=${v%:*} + want_ver=${v#*:} + for wx in ${WANT_AUTOCONF} ; do + if [ -x "${full_argv0}-${wx}" ] ; then + binary="${full_argv0}-${wx}" + v="x" + elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then + binary="${full_argv0}-${auto_ver}" + v="x" + fi + done + [ "${v}" = "x" ] && break + done +fi + +# +# autodetect helpers +# +acprereq_version() { + sed -n -r \ + -e '/^\s*(#|dnl)/d' \ + -e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \ + "$@" | + LC_ALL=C sort -n -t . | + tail -1 +} + +generated_version() { + local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*' + sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@" +} + +# +# autodetect routine +# +if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then + err "Since configure.ac is present, aclocal always use\n" \ + "\tautoconf 2.59+, which conflicts with your choice and\n" \ + "\tcauses error. You have two options:\n" \ + "\t1. Try execute command again after removing configure.ac\n" \ + "\t2. Don't set WANT_AUTOCONF" +fi + +if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then + # Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE + # is set to an older version, let's do some sanity checks. + case "${WANT_AUTOMAKE}" in + 1.[456]) + acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null) + [ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles}) + + [ -z "${confversion}" ] && [ -r "configure" ] \ + && confversion=$(generated_version configure) + + if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then + binary="${full_argv0}-2.13" + fi + esac +fi + +if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then + if [ -n "${WANT_AUTOCONF}" ] ; then + warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}" + fi + warn "DEBUG: will execute <${binary}>" +fi + +# +# for further consistency +# +if [ -z "${WANT_AUTOCONF}" ] ; then + for v in ${vers} ; do + auto_ver=${v%:*} + want_ver=${v#*:} + if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then + export WANT_AUTOCONF="${want_ver}" + break + fi + done +fi + +# +# Now try to run the binary +# +if [ ! -x "${binary}" ] ; then + # this shouldn't happen + err "${binary} is missing or not executable.\n" \ + "\tPlease try emerging the correct version of autoconf." +fi + +exec "${binary}" "$@" +# The shell will error out if `exec` failed. diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest index a96cfc3f6762..204716cfc1eb 100644 --- a/sys-devel/autoconf/Manifest +++ b/sys-devel/autoconf/Manifest @@ -7,13 +7,17 @@ AUX autoconf-2.69-fix-libtool-test.patch 1093 BLAKE2B e7b98ae1c84d6d0a41daa16c71 AUX autoconf-2.69-make-tests-bash5-compatible.patch 2275 BLAKE2B 17fd9702c37cc7686a232e0bb93e5fc04d11b65945f89d79673302bec393bd5572a961b0ecedd743b3336f2583534063b6dd9b3095d0cc6bbd4cf55a58145c54 SHA512 f2672e99afb69cf625097ba5e6d15356eec5c41e095ff60da33331184ecd635d97fa20f20a2db8cfdeb96fde14dca0cdee7081df3328e8032f66eeed58374e36 AUX autoconf-2.69-perl-5.26-2.patch 1003 BLAKE2B e2a858f905f20d46a52ac7d78be63ef0ea5ce0b87a7059ea17317bed3b658c0eafe3f9d8b1b11f4d84d3160bfa3f504e980870fe562d7a1ba6da1c70177e49bb SHA512 b02086ac8a468a626d8b6506aa14e19ef10e4d33b91a7647f74d5746cce9f690d6cf5840ea81c593f63e8f94275974f31c8695065844380678e83153c1b547d0 AUX autoconf-2.69-perl-5.26.patch 820 BLAKE2B 405d92044f338b8c7f0ebc6b0007938143c011eff116a65dd06a126a9ab3b127ee766c618e0d51caf88821d979632e7949c843ebad1c5c9e87ad066aa4a46376 SHA512 0202c099b85102dab18ad7d4268b836cadf587d0a48aefa386e70539b3b689fd580053d7287730f1d0a9cc97d6eeb41c1579a181a82a5cb2e04e436bb96d0b20 +AUX autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch 12665 BLAKE2B 492810e53148add9fdf09d70ad919ab27cd0ccd441c4e1dd7a0439feb27cf4ea7a84286955396ecbe2a35688acbfd967fe4223e53f3c8a56ab1c660d5e4016d1 SHA512 f4683465a1a8e129cb9209364b1c0d11790157308e80c0a94e7c5e121876b2a3caaec95bae9837832ea7583b40768d276ed73484ef7a8eee709f549efa96a15c +AUX autoconf-2.70_beta3-build-aux_no_transform_name.patch 2000 BLAKE2B f177580dad9ac81ab7d3313b999a2fc972102ae7e344974ad0ffaa33bc1ab4ecde4de703e63110261f3bf1e4c9ea608c7cc9c0d4320af634b144b9b5f09d28df SHA512 919be556d085d1a5c1d014fb5d18fcf41e53002c44197650b5e411f25ff800e442a58a256a38e66cc628d444b7e6126d543125535f079918ff4975a005a3a5db DIST autoconf-2.13.tar.gz 443844 BLAKE2B ade10f9d4a0b1a0e8b752eee817cfe100d77b074192b9892330402ddc5b62dda1a3485ce0c36e72191daa9fd49382b99851cb6aa3a13aca8cf2ae6e884638fb6 SHA512 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d1782f259846da48dc8106a1d32ae2b24f3a864c3be0e9e8dc7d6b6ca8781b83ff33a691c88e68391d1ea861ccf23 SHA512 ee4b504447c14a59b849d0915e55a90522cfb071d1583af2bd3575e5a05d7bd290e55e0e9d0760c8f36043f926199fc2d962b559d27d2f95c70d0e147b4ad0a3 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e SHA512 55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b +DIST autoconf-2.70_beta3.tar.xz 1321512 BLAKE2B 92dca4fbd6c247a3b3383289e1a2d6c127f5a333969b8a7051f98adfbe080e702c90b3001dde4759a84c89d5e7ccd7991e509492533a8753fd299aaa46080f1a SHA512 d825d9ce7501f0dfa667ad220339a1668c9472f0601a0ec7dac109af994cacfc2ce49dd01c478a47c7c25f98ba3726c735f1e7002e7b4da71451799f742a2eb1 EBUILD autoconf-2.13-r1.ebuild 1539 BLAKE2B 30a8d2ddaba7e878177c86ef825d41122c7c99f24ab77169833e0172bc3c3fb6f9879c3ad48863c4c0a2f305a9ce304f072b1afd02d3c01fa1ee5585dd14cf8c SHA512 033383d86e1b2097992a79e9078a931557041af2ddc09f02a3f256343a40ba5dc5ef5380232d1c88b6f0716936cb599ecb789a9a3b9af5be8bdd713f1b9b4ff9 EBUILD autoconf-2.64-r1.ebuild 647 BLAKE2B 7af4ebd9fe46e9808285a02471375d268d8fb2e24f00d60a9aec1c962c6bacea1ae8f256b9decf22ffda6470bd3a44f43a89bb05bc91c667abd10bdceb171ece SHA512 abf831a67e7d72816a69ee00735a47e624fb74739ef4b3e8b901f660e2aaa285c44a5950fd29c19b27bc455466a27a654fa8472c958649178644b75f86001a89 EBUILD autoconf-2.69-r4.ebuild 1331 BLAKE2B bfc38c5419976a69f7c8e80c26656760dfd2305f3fe6c18571cd9367017b5d564d761e314171da186b0f9e1a02a72b3287269f52fd9bada941f064b2da8dbdfc SHA512 77ea183450866b03f924af1455fd499c95e7db55493d457234d28966cae1edbaf267bdabd019d11b7260bb071a1f067aaaf6c5175aad3625119988148a3f5020 EBUILD autoconf-2.69-r5.ebuild 1851 BLAKE2B aaedfb452edcdd3c6e7f23094250e0d055df02f47044532d4f32a0993375678e75f45c68f3214daa37895568786357ae7e9a51f264a2b497cba3541bae07fe5d SHA512 a6f4a86fbd1d3ea73748f7ed3f090af35c0c371eecba7977b5f5306663524e77d0dd4a7e3e58e88a6f020caab5a1d03708cc968916ecc632dea7d35dc0394eb3 +EBUILD autoconf-2.70_beta3-r1.ebuild 1716 BLAKE2B 94c9953bc1a61b2e90b3c8a67b096d64c68c2af4b3c537c934426e165db903b6b8c132cf1294b84805de463385fe019311fa328c51292ba63fc38aa8f5e789e1 SHA512 2fd2e545b771e58a34489500fac9bf8d3c86ef62e64e985939ca6ea15299deb87ae32a19172129b375b7b78c577dd54478973554bd92318f2c2485b317b1b9e7 EBUILD autoconf-9999.ebuild 1201 BLAKE2B 54056afab7ae1d33423957ee088defa5210313283b1287dadacd86291e8029b2337707c75bc28cadb9c33c5933ac94142684ffed93112fffff5e59aa045a1cc2 SHA512 5fda1ae65b6831eaffbcb1ad1f63bfd0cbb98aabafa0abc183038e394931d7feeeba98a5d9824a54ca937aa9f62f332b3b363970b7a239c4a81faa0a3a22fb0e MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild b/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild new file mode 100644 index 000000000000..e4079a394a27 --- /dev/null +++ b/sys-devel/autoconf/autoconf-2.70_beta3-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git" + inherit git-r3 +else + MY_PV="2.69d" + MY_P="${PN}-${MY_PV}" + SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz -> ${P}.tar.xz" + [[ "${PV}" == *_beta* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + S="${WORKDIR}/${MY_P}" +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3" +SLOT="${PV/_*}" +IUSE="emacs" + +BDEPEND=">=sys-devel/m4-1.4.16 + >=dev-lang/perl-5.6" +RDEPEND="${BDEPEND} + !~sys-devel/${P}:2.5 + ~sys-devel/autoconf-wrapper-14_pre2" +[[ ${PV} == "9999" ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +PATCHES=( + "${FILESDIR}/${P}-build-aux_no_transform_name.patch" #753023 + "${FILESDIR}/${P}-build-aux_avoid_autoreconf.patch" +) + +src_prepare() { + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + if [[ ${CHOST} == *-darwin* ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch ) + fi + + # Save timestamp to avoid later makeinfo call + touch -r doc/{,old_}autoconf.texi || die + + toolchain-autoconf_src_prepare + + # Restore timestamp to avoid makeinfo call + # We already have an up to date autoconf.info page at this point. + touch -r doc/{old_,}autoconf.texi || die +} diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch new file mode 100644 index 000000000000..a884c503d164 --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_avoid_autoreconf.patch @@ -0,0 +1,272 @@ +--- autoconf-2.69d/Makefile.in ++++ autoconf-2.69d/Makefile.in +@@ -221,10 +221,10 @@ + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ +- $(am__configure_deps) $(dist_buildaux_SCRIPTS) \ +- $(srcdir)/doc/version.texi $(srcdir)/doc/stamp-vti \ +- $(dist_lisp_LISP) $(dist_autoconflib_DATA) \ +- $(dist_autotestlib_DATA) $(dist_m4sugarlib_DATA) \ ++ $(am__configure_deps) $(srcdir)/doc/version.texi \ ++ $(srcdir)/doc/stamp-vti $(dist_lisp_LISP) \ ++ $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \ ++ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \ + $(dist_perllib_DATA) $(am__DIST_COMMON) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +@@ -258,15 +258,15 @@ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" \ +- "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" \ +- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" \ +- "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" \ ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \ ++ "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" \ ++ "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" \ ++ "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" \ + "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" \ + "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" \ + "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" \ + "$(DESTDIR)$(pkgdatadir)" +-SCRIPTS = $(bin_SCRIPTS) $(dist_buildaux_SCRIPTS) $(noinst_SCRIPTS) ++SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS) + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -341,10 +341,11 @@ + NROFF = nroff + MANS = $(dist_man_MANS) + DATA = $(dist_autoconflib_DATA) $(dist_autotestlib_DATA) \ +- $(dist_m4sugarlib_DATA) $(dist_perllib_DATA) \ +- $(nodist_autoconflib_DATA) $(nodist_autoscanlib_DATA) \ +- $(nodist_autotestlib_DATA) $(nodist_m4sugarlib_DATA) \ +- $(nodist_pkgdata_DATA) $(pkgdata_DATA) ++ $(dist_buildaux_DATA) $(dist_m4sugarlib_DATA) \ ++ $(dist_perllib_DATA) $(nodist_autoconflib_DATA) \ ++ $(nodist_autoscanlib_DATA) $(nodist_autotestlib_DATA) \ ++ $(nodist_m4sugarlib_DATA) $(nodist_pkgdata_DATA) \ ++ $(pkgdata_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +@@ -754,12 +755,23 @@ + lib/autotest/specific.m4 + + nodist_autotestlib_DATA = lib/autotest/autotest.m4f +-buildauxdir = $(pkgdatadir)/build-aux +-dist_buildaux_SCRIPTS = \ ++ ++# These are declared as _DATA so that they are not subject to ++# --program-transform-name; $(pkgdatadir) is sufficient to keep ++# multiple installations separate, and autoreconf looks for them by ++# their unadorned names. However, autoreconf copies the executable ++# bit when it copies these files into a source tree, and _DATA items ++# are installed as not-executable, so we have to make them executable ++# in a hook rule. ++AUXSCRIPTS = \ + build-aux/config.guess \ + build-aux/config.sub \ + build-aux/install-sh + ++buildauxdir = $(pkgdatadir)/build-aux ++dist_buildaux_DATA = \ ++ $(AUXSCRIPTS) ++ + dist_man_MANS = \ + man/autoconf.1 \ + man/autoheader.1 \ +@@ -994,56 +1006,6 @@ + else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ + done; \ + done; rm -f c$${pid}_.???; exit $$bad +-install-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS) +- @$(NORMAL_INSTALL) +- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || list=; \ +- if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \ +- fi; \ +- for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ +- done | \ +- sed -e 'p;s,.*/,,;n' \ +- -e 'h;s|.*|.|' \ +- -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ +- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ +- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ +- if ($$2 == $$4) { files[d] = files[d] " " $$1; \ +- if (++n[d] == $(am__install_max)) { \ +- print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ +- else { print "f", d "/" $$4, $$1 } } \ +- END { for (d in files) print "f", d, files[d] }' | \ +- while read type dir files; do \ +- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ +- test -z "$$files" || { \ +- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(buildauxdir)$$dir'"; \ +- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(buildauxdir)$$dir" || exit $$?; \ +- } \ +- ; done +- +-uninstall-dist_buildauxSCRIPTS: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_buildaux_SCRIPTS)'; test -n "$(buildauxdir)" || exit 0; \ +- files=`for p in $$list; do echo "$$p"; done | \ +- sed -e 's,.*/,,;$(transform)'`; \ +- dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir) +- +-installcheck-dist_buildauxSCRIPTS: $(dist_buildaux_SCRIPTS) +- bad=0; pid=$$$$; list="$(dist_buildaux_SCRIPTS)"; for p in $$list; do \ +- case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ +- *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ +- esac; \ +- f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ +- for opt in --help --version; do \ +- if "$(DESTDIR)$(buildauxdir)/$$f" $$opt >c$${pid}_.out \ +- 2>c$${pid}_.err </dev/null \ +- && test -n "`cat c$${pid}_.out`" \ +- && test -z "`cat c$${pid}_.err`"; then :; \ +- else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ +- done; \ +- done; rm -f c$${pid}_.???; exit $$bad + doc/$(am__dirstamp): + @$(MKDIR_P) doc + @: > doc/$(am__dirstamp) +@@ -1385,6 +1347,27 @@ + @list='$(dist_autotestlib_DATA)'; test -n "$(autotestlibdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(autotestlibdir)'; $(am__uninstall_files_from_dir) ++install-dist_buildauxDATA: $(dist_buildaux_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(buildauxdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(buildauxdir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(buildauxdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(buildauxdir)" || exit $$?; \ ++ done ++ ++uninstall-dist_buildauxDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(dist_buildaux_DATA)'; test -n "$(buildauxdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(buildauxdir)'; $(am__uninstall_files_from_dir) + install-dist_m4sugarlibDATA: $(dist_m4sugarlib_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_m4sugarlib_DATA)'; test -n "$(m4sugarlibdir)" || list=; \ +@@ -1794,7 +1777,7 @@ + all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(LISP) $(ELCFILES) $(MANS) \ + $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(lispdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(buildauxdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(autoconflibdir)" "$(DESTDIR)$(autoscanlibdir)" "$(DESTDIR)$(autotestlibdir)" "$(DESTDIR)$(m4sugarlibdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -1858,13 +1841,14 @@ + info-am: $(INFO_DEPS) + + install-data-am: install-dist_autoconflibDATA \ +- install-dist_autotestlibDATA install-dist_buildauxSCRIPTS \ ++ install-dist_autotestlibDATA install-dist_buildauxDATA \ + install-dist_lispLISP install-dist_m4sugarlibDATA \ + install-dist_perllibDATA install-info-am install-man \ + install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \ + install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \ + install-nodist_pkgdataDATA install-pkgdataDATA +- ++ @$(NORMAL_INSTALL) ++ $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-am + + install-dvi-am: $(DVIS) +@@ -1980,8 +1964,7 @@ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done +-installcheck-am: installcheck-binSCRIPTS \ +- installcheck-dist_buildauxSCRIPTS installcheck-local ++installcheck-am: installcheck-binSCRIPTS installcheck-local + + maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +@@ -2003,7 +1986,7 @@ + ps-am: $(PSS) + + uninstall-am: uninstall-binSCRIPTS uninstall-dist_autoconflibDATA \ +- uninstall-dist_autotestlibDATA uninstall-dist_buildauxSCRIPTS \ ++ uninstall-dist_autotestlibDATA uninstall-dist_buildauxDATA \ + uninstall-dist_lispLISP uninstall-dist_m4sugarlibDATA \ + uninstall-dist_perllibDATA uninstall-dvi-am uninstall-html-am \ + uninstall-info-am uninstall-man \ +@@ -2015,7 +1998,8 @@ + + uninstall-man: uninstall-man1 + +-.MAKE: all check check-am install install-am install-strip ++.MAKE: all check check-am install install-am install-data-am \ ++ install-strip + + .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am \ + check-local clean clean-aminfo clean-cscope clean-generic \ +@@ -2026,24 +2010,24 @@ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binSCRIPTS install-data install-data-am \ +- install-dist_autoconflibDATA install-dist_autotestlibDATA \ +- install-dist_buildauxSCRIPTS install-dist_lispLISP \ +- install-dist_m4sugarlibDATA install-dist_perllibDATA \ +- install-dvi install-dvi-am install-exec install-exec-am \ +- install-html install-html-am install-info install-info-am \ +- install-man install-man1 install-nodist_autoconflibDATA \ +- install-nodist_autoscanlibDATA install-nodist_autotestlibDATA \ +- install-nodist_m4sugarlibDATA install-nodist_pkgdataDATA \ +- install-pdf install-pdf-am install-pkgdataDATA install-ps \ +- install-ps-am install-strip installcheck installcheck-am \ +- installcheck-binSCRIPTS installcheck-dist_buildauxSCRIPTS \ ++ install-data-hook install-dist_autoconflibDATA \ ++ install-dist_autotestlibDATA install-dist_buildauxDATA \ ++ install-dist_lispLISP install-dist_m4sugarlibDATA \ ++ install-dist_perllibDATA install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-man1 \ ++ install-nodist_autoconflibDATA install-nodist_autoscanlibDATA \ ++ install-nodist_autotestlibDATA install-nodist_m4sugarlibDATA \ ++ install-nodist_pkgdataDATA install-pdf install-pdf-am \ ++ install-pkgdataDATA install-ps install-ps-am install-strip \ ++ installcheck installcheck-am installcheck-binSCRIPTS \ + installcheck-local installdirs maintainer-clean \ + maintainer-clean-aminfo maintainer-clean-generic \ + maintainer-clean-vti mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am tags \ + tags-am uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-dist_autoconflibDATA uninstall-dist_autotestlibDATA \ +- uninstall-dist_buildauxSCRIPTS uninstall-dist_lispLISP \ ++ uninstall-dist_buildauxDATA uninstall-dist_lispLISP \ + uninstall-dist_m4sugarlibDATA uninstall-dist_perllibDATA \ + uninstall-dvi-am uninstall-html-am uninstall-info-am \ + uninstall-man uninstall-man1 uninstall-nodist_autoconflibDATA \ +@@ -2200,6 +2184,14 @@ + + lib/autotest/autotest.m4f: $(autotest_m4f_dependencies) + ++install-data-hook: install-data-hook-make-aux-scripts-executable ++install-data-hook-make-aux-scripts-executable: ++ for s in $(AUXSCRIPTS); do \ ++ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \ ++ done ++ ++.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable ++ + man/autoconf.1: $(common_dep) man/autoconf.w man/autoconf.x $(binsrcdir)/autoconf.as + man/autoheader.1: $(common_dep) man/autoheader.w man/autoheader.x $(binsrcdir)/autoheader.in + man/autom4te.1: $(common_dep) man/autom4te.w man/autom4te.x $(binsrcdir)/autom4te.in diff --git a/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch new file mode 100644 index 000000000000..079fa15306ca --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.70_beta3-build-aux_no_transform_name.patch @@ -0,0 +1,55 @@ +From 0f7e5a5477f97b8a105d563bc7590ebefaff854d Mon Sep 17 00:00:00 2001 +From: Zack Weinberg <zackw@panix.com> +Date: Thu, 5 Nov 2020 10:19:26 -0500 +Subject: Do not apply --program-transform-name to build-aux scripts. + +autoreconf expects to find $(pkgdatadir)/build-aux/config.sub etc +under those names, not names modified by --program-transform-name. +Placing them in $(pkgdatadir) is sufficient to keep parallel +installations of autoconf separate: anyone doing that would need +to adjust @PACKAGE@ anyway. + +* lib/local.mk: Use a _DATA rule, not a _SCRIPTS rule, to install + config.guess, config.sub, and install-sh. + (install-data-hook-make-aux-scripts-executable): New hook rule. +--- + lib/local.mk | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/lib/local.mk b/lib/local.mk +index d4ecf3cb..e380403f 100644 +--- a/lib/local.mk ++++ b/lib/local.mk +@@ -201,8 +201,27 @@ lib/autotest/autotest.m4f: $(autotest_m4f_dependencies) + ## Install auxiliary scripts. ## + ## --------------------------- ## + +-buildauxdir = $(pkgdatadir)/build-aux +-dist_buildaux_SCRIPTS = \ ++# These are declared as _DATA so that they are not subject to ++# --program-transform-name; $(pkgdatadir) is sufficient to keep ++# multiple installations separate, and autoreconf looks for them by ++# their unadorned names. However, autoreconf copies the executable ++# bit when it copies these files into a source tree, and _DATA items ++# are installed as not-executable, so we have to make them executable ++# in a hook rule. ++ ++AUXSCRIPTS = \ + build-aux/config.guess \ + build-aux/config.sub \ + build-aux/install-sh ++ ++buildauxdir = $(pkgdatadir)/build-aux ++dist_buildaux_DATA = \ ++ $(AUXSCRIPTS) ++ ++install-data-hook: install-data-hook-make-aux-scripts-executable ++install-data-hook-make-aux-scripts-executable: ++ for s in $(AUXSCRIPTS); do \ ++ chmod +x "$(DESTDIR)$(pkgdatadir)/$$s"; \ ++ done ++ ++.PHONY: install-data-hook install-data-hook-make-aux-scripts-executable +-- +cgit v1.2.1 + diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest index b22f4a58fc2e..5a942407c5b2 100644 --- a/sys-devel/automake/Manifest +++ b/sys-devel/automake/Manifest @@ -13,7 +13,10 @@ AUX automake-1.16.1-py3-compile.patch 2043 BLAKE2B a7bee250f6dfb9281ca6b448b2f97 AUX automake-1.16.1-py3-no-pyo-files.patch 6197 BLAKE2B 4de9f40d7bcf77602678ffe72a7c58d41bb0b82e142d2d289f3336623360e2d2565cffffc8f5b344821385fc11094f4a5bd873e3b0194393bcf6a2c8c67e613f SHA512 93a04a654cf3b036b40df72dbf47270b022ca2638a0b9dd8ada7b5f853fcb4f4ff4a22fd34d2d8e4c13c80cb3983813f52a5770de99b9da17a4837059cc56a5a AUX automake-1.16.1-py3-pep3147-cmdline.patch 599 BLAKE2B 0bdd6885e8856905b1389facf2792f6e4752a2c16e3b478e05ad897ce9e58f0ff61b160065dcc18bad28c13cd1e8d42948681f600ae9e68ff7e8c9d5b2f8f6b8 SHA512 eea764c559e03a6d5788745e33a5aa153664107451a3ec1164621a2cb69ddcf30bf81de76b9b8f40896f8a0d5406a02fe638d4d47aeb68226c5599a7ca87147c AUX automake-1.16.1-py3-pep3147.patch 1565 BLAKE2B d1de92c94bd37b439e09003f27729c892c6ed7d807c70d6774f9bb0379a771059c1816c4a4fea3e88717223fdec557d20df914211e62e9e2d009339344c39df8 SHA512 f8a22e014123dffb442786a1f18f0623ed3b4fcb6b90649607c2ceb7f8ce0423181a83f9f15a575cc8e1408f812349ea3c33e89028c0e5714a152cfbdbdd742a +AUX automake-1.16.2-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de981e56c633b6993db5bc7fc1c84f9be002018d4dd25c13bbc36ef7378940680b3c73a559100134e2356e7d626cdc24d91497e644e8e27268a1 SHA512 41d0d797cf25f2e080a57f57bee041cc02ea9e0a7f1ee8aa55af112f43e02c58b867d778b79d82b909d13c55ac0326718f1716947c9022e035e4631d7dbe85a0 +AUX automake-1.16.2-fix-py-compile-basedir.sh-test.patch 985 BLAKE2B 9a07629d107316ed765990ef2e1356a16dfb6231829315bab704dc7fdb4716dce9320eef4baaef3ab76db2908b9071c4cb35c6607be8b984896b2cfbcdb8b474 SHA512 22c1db04dcb71a6d1519c0d54e18c40f0ad5d4ada82edf606c8c0da6a3fb6dadcd7ec5289da2373b17c063211cb1ef6c85b5a6a7e355f906ca660bc402ce184b AUX automake-1.16.2-py3-compile.patch 2412 BLAKE2B 20a3ce66047ad5106f0cafccce19fc8acd47ee0ba01882d1ff18c1a15592ef68b9c3debb61df78a31f238938a93ca4dc281b358b588727864673b09b11167131 SHA512 3bb9769d37b02e89373612752f127c582f948347a6f54e8b24dba262e14ca860e8fa507d96c0d51f0d64587371b9da17eb270dd5b7695091181731e35e5b9c2d +AUX automake-1.16.2-skip-tags-lisp-space-without-etags.patch 676 BLAKE2B 0a4281dee8af106f62a15a9530ac8b04f65474b8b5e4120224ef926251dc2920c8cce9ce6d9954fb76bca26604f641437846aedab5310a824f8cba0c8b29d060 SHA512 586163cc8741b25909607231ffa2c528a68d7ef203d7cf0e5412e5bd6e9020e3f79820b2456dd7065bac7bb26182d82beb69f1fcd152689ab300edee6b2044f2 AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31 AUX automake-1.4-ansi2knr-stdlib.patch 176 BLAKE2B a62062f56aa89108f851d8f51d4774b36d639a11cf88d20c8dc0df3593531ed053d2374112ce61157a043bb3b5803c896c2f0cac0ecf2d3d5081aaf73a29b2ef SHA512 fa8de19294b53adbcafdf551e2611e842df610bfb6bfd1d11022c44870a7b0a6ac8c53c4ff78a6cb36f8994d2e0bd6ab3aafbd7ce74a33789585e58419966634 AUX automake-1.4-libtoolize.patch 496 BLAKE2B 966b85c9c7d9d87506d01d55e08a019167a368058784ed2fcb627f79f91d69313ca8bae68d10b522400782bcce553a25a9ddfa3d196d3e4df6ea6bfe8dc48b60 SHA512 8cc4ae889552ffe431adbfa2b0d599416c049072b54e2f9a145342eccaa1c526cfb125315b3549957b41e0b4407ca6c96ad5bd120b75ab09221cf6efdee6ac05 @@ -47,6 +50,7 @@ DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c6 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3 DIST automake-1.16.2.tar.xz 1545912 BLAKE2B 88e12fc7792c1a3a9c3b9095760145c2ebf3799602320efe5885a0cac16ced2cfb95865abf0a96b6969aa4652eb2b3d2ac8dae550d721392be45fc10c2458b67 SHA512 a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b +DIST automake-1.16.3.tar.xz 1590708 BLAKE2B ab6001a1b09e171ec83bac07155a77ab0fc29f5185116616aa3080b27e8bbf759472cd0dfb75630b26f7ad8d0741e668662d00b370ef79cf5ef6c62e945c94da SHA512 7265aeb7f82a8a205761d76e6ade7b7e97831c283349fd80f86e511f4b0b3e17f429d1506fca84c76079f63781e5dbf5ca81455d6bf6cda27d2e5c3d23b0d1aa DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f @@ -61,7 +65,8 @@ EBUILD automake-1.14.1-r2.ebuild 3052 BLAKE2B 9f9127fefca8f16ecf0de2f072f85d428b EBUILD automake-1.15.1-r2.ebuild 3222 BLAKE2B fb0da9250436fa471435d93df44acaaba32903b7dcdce1a4eab92679d0ae92710b36246e7480f63adb181dfa14cb9ccfe6e7f8dfefbd79b8cd2f39d9a4845819 SHA512 d103e91a98f614130f0736a843e944eac33b5f9ee6c3c5d52152c193386ccdd11363db286f39bf063f4845f8463ef08066a1a5337345bfd8cdc2157234720165 EBUILD automake-1.16.1-r1.ebuild 2940 BLAKE2B d4a8801f4dfbcff936b960fef2af6cbc3ffbea408e9123ff9bf410d1e53cd479f6d11f02a648ddb2d2dbbd9786f98443333becb8304cfe7267349c584ebbcf81 SHA512 499e4f37a028f51e7113e37ecbbed445888dc09b2a62dd8c3ab43afed91789d1d9878a25f011aefe825c18259ce5ccd0dfcf0e05b95598e1425bfcad34c0d866 EBUILD automake-1.16.1-r2.ebuild 3630 BLAKE2B 4623977d5598404a613dfee378feb53b97ae5c724c6fccbb5a236ab4861c2755e05f0777155d3182ffadf6b777f90a88dac881c7a2bb356b7c1ad1f30f304153 SHA512 fa5f121283bee781449981d985b571fa244503e17713e679cb2c3845631d472e614c5f6c98c91230288bd9ffed16bc88ac98b8c84f2414618ffc174f5b0547b2 -EBUILD automake-1.16.2.ebuild 3416 BLAKE2B a57d755ad8e43746d96878c154d03360c633e29c149056e990b6f10b70a0baa21a26e990e245d56458b5b1f64e53fbce6ff9c1b7f8d829dc2815239b0557b3b1 SHA512 58c0cb4967fa32ea0f5878e0521dbf5514c4c72423bc379f2190d70067235d716f6b648b925d61025d9b5823ffeab4a86c0834f9a07ecaeae46ca603bc83db4f +EBUILD automake-1.16.2-r1.ebuild 3569 BLAKE2B 35a59134fa538998807daba5a2f8ac3438bf9b9a0a554d6e9a929b7b3f501889040235045359c32b2bcd6c801707bfd78f3e98df0f94f50aec79a74c05979ff3 SHA512 d16412bc257248130715ab528f9a708b1d3d1b0ee54ebf7d60253f075a345c97acd4056d7036a4e8cc4dd4e3293642a52d19046211febffeff1a71721b09522d +EBUILD automake-1.16.3-r1.ebuild 3505 BLAKE2B 3f1e55731cd5a7b82019c6619a65fd82a728e7d3ec64f429f8e13607c6d953384036e3dd7e2fb9afeb0bf5c8ee5785a987f8bff78fd63b679b95ef9e302ec644 SHA512 7002c53b2731a9eb4132f69a3636d8325b85ab7f6e2ba26cd5710402b69bfb6b6a829966c2daa56a855300fdac031324942fee9240476d207e9d398590bff3ff EBUILD automake-1.4_p6-r2.ebuild 2469 BLAKE2B f631fc0d87edf6cef1a8a07f0417fd72df8229fdaeca66f2f85944cb00fa3f6dfba73cd20df88ab2fe6fbe268473d8dffd6ac203980d4e241988ad3084ce9271 SHA512 ff05eabeb5baf5d8415b3e8c87e462e1c3f5b3a46a4910f9c0216746e6794739947c98515251b722dfbce51cb12868f4dcc247deac924371bf504a7b35fb4c96 EBUILD automake-1.5-r2.ebuild 2243 BLAKE2B c530c3ff67f450a3c5c10ccf224a2e87021e17821ce15b288dc979d8af78f81d578767d86fec09b15b704d32c7c46504e3ec35b126cf6792145c6056b57ba048 SHA512 7ca78eba7b26acb2ed84e8382148a895581345d359bf63c8aeee5efca99fd9637247b573c420a42f6a5f6bcfe2093057470f6ee259dea06e0a99b7ab0e1ae927 EBUILD automake-1.6.3-r2.ebuild 2045 BLAKE2B 6c06598b71fbaa8976d5d8b1fdbe5c091698a38c881b3a5f978eebc96207b3dde2d63022b0e2f6b9ebfb9fa0e22e7ab6a67734f52cd52be083ceda959af6a4bc SHA512 b583d6abf8fb8f0f15f03d5faab000244322c309b089f40b59d0b0a3202c58427cc5de9b1aa423c1cacd20277c51387755e2c367e80a85d0bab923a5b6bd85be diff --git a/sys-devel/automake/automake-1.16.2-r1.ebuild b/sys-devel/automake/automake-1.16.2-r1.ebuild new file mode 100644 index 000000000000..a40192308de3 --- /dev/null +++ b/sys-devel/automake/automake-1.16.2-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 ) + +inherit python-any-r1 + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git" + + inherit git-r3 +else + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + if [[ ${PV/_beta} == ${PV} ]]; then + MY_P="${P}" + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + else + MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b" + MY_P="${PN}-${MY_PV}" + + # Alpha/beta releases are not distributed on the usual mirrors. + SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz" + fi + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Used to generate Makefile.in from Makefile.am" +HOMEPAGE="https://www.gnu.org/software/automake/" + +LICENSE="GPL-2" +# Use Gentoo versioning for slotting. +SLOT="${PV:0:4}" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/perl + >=sys-devel/automake-wrapper-11 + >=sys-devel/autoconf-2.69:* + sys-devel/gnuconfig" +DEPEND="${RDEPEND}" +BDEPEND=" + app-arch/gzip + sys-apps/help2man + test? ( ${PYTHON_DEPS} ) +" + +PATCHES=( + "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch + "${FILESDIR}"/automake-1.16.2-skip-tags-lisp-space-without-etags.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + export WANT_AUTOCONF=2.5 + # Don't try wrapping the autotools this thing runs as it tends + # to be a bit esoteric, and the script does `set -e` itself. + ./bootstrap || die + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die + + # Bug 628912 + if ! has_version sys-apps/texinfo ; then + touch doc/{stamp-vti,version.texi,automake.info} || die + fi +} + +# slot the info pages. do this w/out munging the source so we don't have +# to depend on texinfo to regen things. #464146 (among others) +slot_info_pages() { + pushd "${ED}"/usr/share/info >/dev/null || die + rm -f dir + + # Rewrite all the references to other pages. + # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. + # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4. + local p pages=( *.info ) args=() + for p in "${pages[@]/%.info}" ; do + args+=( + -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|" + -e "s:(${p}):(${p}-${SLOT}):g" + ) + done + sed -i "${args[@]}" * || die + + # Rewrite all the file references, and rename them in the process. + local f d + for f in * ; do + d=${f/.info/-${SLOT}.info} + mv "${f}" "${d}" || die + sed -i -e "s:${f}:${d}:g" * || die + done + + popd >/dev/null || die +} + +src_install() { + default + + slot_info_pages + rm "${ED}"/usr/share/aclocal/README || die + rmdir "${ED}"/usr/share/aclocal || die + rm \ + "${ED}"/usr/bin/{aclocal,automake} \ + "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die + + # remove all config.guess and config.sub files replacing them + # w/a symlink to a specific gnuconfig version + local x + for x in guess sub ; do + dosym ../gnuconfig/config.${x} \ + /usr/share/${PN}-${SLOT}/config.${x} + done + + # Avoid QA message about pre-compressed file in docs + local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz" + if [[ -f "${tarfile}" ]] ; then + gunzip "${tarfile}" || die + fi +} diff --git a/sys-devel/automake/automake-1.16.2.ebuild b/sys-devel/automake/automake-1.16.3-r1.ebuild index fc05add3e373..361141a285ab 100644 --- a/sys-devel/automake/automake-1.16.2.ebuild +++ b/sys-devel/automake/automake-1.16.3-r1.ebuild @@ -48,8 +48,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/automake-1.16.2-py3-compile.patch + "${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch + "${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch ) -# All patches have been submitted upstream. pkg_setup() { use test && python-any-r1_pkg_setup diff --git a/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch b/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch new file mode 100644 index 000000000000..5cddb4cfb83f --- /dev/null +++ b/sys-devel/automake/files/automake-1.16.2-fix-instmany-python.sh-test.patch @@ -0,0 +1,26 @@ +From 50daac4f15d207b6b69011b9cdde62b56c1c8b10 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Fri, 20 Nov 2020 02:17:31 +0100 +Subject: [PATCH 2/2] tests: fix instmany-python.sh: increase limit + +Still failing with 4500 on Gentoo. Passing with 7000... +--- + t/instmany-python.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/instmany-python.sh b/t/instmany-python.sh +index dce3594b5..1c482520d 100644 +--- a/t/instmany-python.sh ++++ b/t/instmany-python.sh +@@ -21,7 +21,7 @@ + required='python' + . test-init.sh + +-limit=4500 ++limit=7000 + subdir=long_subdir_name_with_many_characters + nfiles=81 + list=$(seq_ 1 $nfiles) +-- +2.29.2 + diff --git a/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch b/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch new file mode 100644 index 000000000000..f49dd253c2d6 --- /dev/null +++ b/sys-devel/automake/files/automake-1.16.2-fix-py-compile-basedir.sh-test.patch @@ -0,0 +1,26 @@ +From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Fri, 20 Nov 2020 02:13:56 +0100 +Subject: [PATCH 1/2] tests: fix py-compile-basedir.sh: add missing test call + +Fixes: b279a0d46 ("tests: in python tests, do not require .pyo files (for python3)") +--- + t/py-compile-basedir.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh +index 13a22ff1d..1a16ee2d7 100644 +--- a/t/py-compile-basedir.sh ++++ b/t/py-compile-basedir.sh +@@ -43,7 +43,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do + py_installed "$d2/sub/$f.pyc" + files=$(find "$d2" | grep '\.py[co]$') + # with new-enough Python3, there are six files. +- test $(echo "$files" | wc -l) -eq 4 || $(echo "$files" | wc -l) -eq 6 ++ test $(echo "$files" | wc -l) -eq 4 || test $(echo "$files" | wc -l) -eq 6 + case $d2 in + .|..) rm -f $files;; + *) rm -rf "$d2";; +-- +2.29.2 + diff --git a/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch b/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch new file mode 100644 index 000000000000..70ca8f783c3e --- /dev/null +++ b/sys-devel/automake/files/automake-1.16.2-skip-tags-lisp-space-without-etags.patch @@ -0,0 +1,23 @@ +From 77d39959511295f5a30332d5d03f0a6956bd9460 Mon Sep 17 00:00:00 2001 +From: Karl Berry <karl@freefriends.org> +Date: Tue, 24 Mar 2020 18:30:18 -0700 +Subject: [PATCH] tests: require etags for tags-lisp-space test. + +* t/tags-lisp-space.sh (required): set to etags. +--- + t/tags-lisp-space.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/tags-lisp-space.sh b/t/tags-lisp-space.sh +index d0a940ba3..44312b0b7 100755 +--- a/t/tags-lisp-space.sh ++++ b/t/tags-lisp-space.sh +@@ -18,7 +18,7 @@ + # if there are CONFIG_HEADERS. + # See automake bug#38139. + +-required='' ++required=etags + . test-init.sh + + # some AC_CONFIG_FILES header is needed to trigger the bug. diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest index 42e48879b172..301de5f45d54 100644 --- a/sys-devel/binutils-hppa64/Manifest +++ b/sys-devel/binutils-hppa64/Manifest @@ -5,9 +5,11 @@ DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd DIST binutils-2.35.1-patches-1.tar.xz 10088 BLAKE2B fa4b0c417b6452757f90243921c60b2406c9bf60d1aaa393654fb23ce52e32fb3e7ed90f6d59286786dd95398a10d008c75bfdca065d704025cc828ff65b225f SHA512 dccb4407f4f2a8b38488f9f42638c10777ee344239cf5d4fcc8f580df3e8ff15d03211dc51ef18d905c326a71771da4b38f47381d6d549422a8353b5da0e7b0b +DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e941535f992150d86f25201cadd07b63daaa36bf76b07dc0aa8a4837da17d1672feb47a7b15f83efdeec5409e695965a10142147a SHA512 b704ebe82c4402f058f9c96991a89256a6b369d28f844bf020ed2c77766894d9a2ca0596cd609de7b389fa8cd52bfab674b6deb10ea2096e50aa57921be2083e DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb EBUILD binutils-hppa64-2.32-r1.ebuild 12648 BLAKE2B aa452384823e5b0be386bc4a7501d49b2de644af4492a05992f7dddd680c5e87481dbf5a38fff342526e571e271adc6af68b33bda2e83059877a307b4d892b81 SHA512 df21c036804f909f7c8b3ccec6119c6f35189cfe3988390be4dbe3f36cc7ead39eea4415cae689dcdcaa9387bb7d97477e50f329c7a11f75d28880a6f676b1eb EBUILD binutils-hppa64-2.33.1.ebuild 12302 BLAKE2B 84e6b959af5995933200f19231c033fbc7bec57f54c7a28d92733556a2194e963120469d68ca488788e32f3199312bf2f08351e1d541e847c15e67d451648b79 SHA512 4b1330e3070fb3ccbaea43f261ce9a96786779d3c876d41fa4e80e73206395ef1586bc7e82e959b744ebe0c6ca798aaa41d48a19c77380b627f0824aad405bba -EBUILD binutils-hppa64-2.34-r2.ebuild 12314 BLAKE2B 7a1914abaa711fb2a4446529b56651b39680b315870d439bf4041de4828fc48ff70a5780dd1332dc9677b44c8b625cd199a3fe9598fc274ae4322fc08e87edd5 SHA512 3d5b043da836315294659097a9adcd2d867973156b4af9c0c95248702c98e700e84dee66a0d9e19058295715a00ada7e2e00374acf5249e526ac95bf7fcb7aad +EBUILD binutils-hppa64-2.34-r2.ebuild 12313 BLAKE2B 13d2653eea8d231d31cb13a0ccd03ae5e372ee4a9e6518750ed12d99761098e6c9e64c091f8fa19eac25933fe810625cf8629a0fb83c3323a56e225a8ec64d1a SHA512 c8128d7acf62c06336df0d70f7455f802d5135317f62f45f50b0585038f85708291d78d2b95836377ad9e8a5200a569dde6e738c1528be7475fc28480e23ebee +EBUILD binutils-hppa64-2.35.1-r1.ebuild 12070 BLAKE2B 28033f46a7a4233a1fc822436fc072eeb428a2cfcccc8b8fbf949bfa16f139d5086031e17a07feb768944169e11aaefc9bc882890d3693953f068551d69051d3 SHA512 3ebbde6b70d31e7685bd3914082b895314195fd428c4225b1cf4030eea22d21fa22c001b3251034e339a90e9d526a51c73604e9711056ff72c605fb2568fb4c4 EBUILD binutils-hppa64-2.35.1.ebuild 12070 BLAKE2B e91f9e33cc2f2c13734659859663bccefeab65cb513c2458b65add662fc00c7a633f765031a6c6e122451cb366edb69d8498b7a6022e9499e10976547cec8013 SHA512 eba147c86196fc04a4cf27ee85c1c4faac430552ee47de942253f80699fc87f5fcee89864570c0552429e8052ddde438832c4e985069e148f6744f490f0cf6d1 MISC metadata.xml 691 BLAKE2B ce21a0c95e69ad1f656373ec843f43ff5300b0145e0d89b92c7d7ae664886db9ba5afd4c39c7d7fe0d4f898b43d98bab6ba562b06945e5016a2abf62e1c4119f SHA512 97ff085ad4b3273a5867d37bb70dc9586a7bc3ffbf9ca1b6c68e224c340afe102afbfc034b339533732afd032a7f8be584e31c8572cd76df90f4db93bac3baa3 diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild index 9fef7573cba2..d7d459bca525 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.34-r2.ebuild @@ -44,7 +44,7 @@ case ${PV} in *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(ver_cut 1-2) - KEYWORDS="-* ~hppa" + KEYWORDS="-* hppa" ;; esac diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild new file mode 100644 index 000000000000..7fc606f9e346 --- /dev/null +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.35.1-r1.ebuild @@ -0,0 +1,430 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CTARGET=hppa64-${CHOST#*-} + +inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" +LICENSE="GPL-3+" +IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test" +REQUIRED_USE="default-gold? ( gold )" + +# Variables that can be set here: +# PATCH_VER - the patchset version +# Default: empty, no patching +# PATCH_BINUTILS_VER - the binutils version in the patchset name +# - Default: PV +# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... +# for the patchsets + +PATCH_VER=2 +PATCH_DEV=dilfridge + +case ${PV} in + 9999) + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + inherit git-r3 + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + SLOT=${PV} + ;; + *) + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" + SLOT=$(ver_cut 1-2) + KEYWORDS="-* ~hppa" + ;; +esac + +# +# The Gentoo patchset +# +PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} +PATCH_DEV=${PATCH_DEV:-slyfox} + +[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + +# +# The cross-compile logic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +# +# The dependencies +# +RDEPEND=" + >=sys-devel/binutils-config-3 + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( sys-apps/texinfo ) + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + sys-devel/flex + virtual/yacc +" + +RESTRICT="!test? ( test )" + +MY_BUILDDIR=${WORKDIR}/build +S=${WORKDIR}/${P/-hppa64/} + +src_unpack() { + case ${PV} in + *9999) + git-r3_src_unpack + ;; + *) + ;; + esac + default + mkdir -p "${MY_BUILDDIR}" +} + +src_prepare() { + if [[ ! -z ${PATCH_VER} ]] ; then + einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}" + eapply "${WORKDIR}/patch"/*.patch + fi + + # This check should probably go somewhere else, like pkg_pretend. + if [[ ${CTARGET} == *-uclibc* ]] ; then + if grep -qs 'linux-gnu' "${S}"/ltconfig ; then + die "sorry, but this binutils doesn't yet support uClibc :(" + fi + fi + + # Make sure our explicit libdir paths don't get clobbered. #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + # Fix locale issues if possible #122216 + if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then + einfo "Fixing misc issues in configure files" + for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do + ebegin " Updating ${f/${S}\/}" + patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + fi + + # Fix conflicts with newer glibc #272594 + if [[ -e libiberty/testsuite/test-demangle.c ]] ; then + sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c + fi + + # Apply things from PATCHES and user dirs + default + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${PV}" + [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" +} + +src_configure() { + # Setup some paths + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + INCPATH=${LIBPATH}/include + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + TOOLPATH=/usr/${CHOST}/${CTARGET} + else + TOOLPATH=/usr/${CTARGET} + fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} + + # Make sure we filter $LINGUAS so that only ones that + # actually work make it through #42033 + strip-linguas -u */po + + # Keep things sane + strip-flags + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" + local myconf=() + + if use plugins ; then + myconf+=( --enable-plugins ) + fi + # enable gold (installed as ld.gold) and ld's plugin architecture + if use gold ; then + myconf+=( --enable-gold ) + if use default-gold; then + myconf+=( --enable-gold=default ) + fi + fi + + if use nls ; then + myconf+=( --without-included-gettext ) + else + myconf+=( --disable-nls ) + fi + + myconf+=( --with-system-zlib ) + + # For bi-arch systems, enable a 64bit bfd. This matches + # the bi-arch logic in toolchain.eclass. #446946 + # We used to do it for everyone, but it's slow on 32bit arches. #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ + # on everyone in alpha (for now), we'll just enable it when possible + has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) + has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + --enable-obsolete + --enable-shared + --enable-threads + # Newer versions (>=2.27) offer a configure flag now. + --enable-relro + # Newer versions (>=2.24) make this an explicit option. #497268 + --enable-install-libiberty + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + ${EXTRA_ECONF} + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # Change SONAME to avoid conflict across + # {native,cross}/binutils, binutils-libs. #666100 + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) + ) + echo ./configure "${myconf[@]}" + "${S}"/configure "${myconf[@]}" || die + + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +src_compile() { + cd "${MY_BUILDDIR}" + # see Note [tooldir hack for ldscripts] + emake tooldir="${EPREFIX}${TOOLPATH}" all + + # only build info pages if the user wants them + if use doc ; then + emake info + fi + + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete +} + +src_test() { + cd "${MY_BUILDDIR}" + # bug 637066 + filter-flags -Wall -Wreturn-type + emake -k check +} + +src_install() { + local x d + + cd "${MY_BUILDDIR}" + # see Note [tooldir hack for ldscripts] + emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install + rm -rf "${ED}"/${LIBPATH}/bin + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH} #171905 + cd "${ED}"/${LIBPATH} + for d in ../* ; do + [[ ${d} == ../${PV} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} + for x in * ; do + mv ${x} ${x/${CTARGET}-} + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/${LIBPATH}/lib + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${PV}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${PV} + + # Handle documentation + if ! is_cross ; then + cd "${S}" + dodoc README + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + docinto opcodes + dodoc opcodes/ChangeLog* + fi + + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null + + # the hppa64 hack; this should go into 9999 as a PN-conditional + # tweak the default fake list a little bit + cd "${D}"/etc/env.d/binutils + sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die +} + +pkg_postinst() { + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${PV} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} + fi +} +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}-<tool> +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - at build-time set scriptdir to point to symlinked location: +# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) +# - at install-time set scriptdir to point to slotted location: +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest index 589df2a53e6a..dfd77b10615e 100644 --- a/sys-devel/binutils/Manifest +++ b/sys-devel/binutils/Manifest @@ -10,11 +10,13 @@ DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd DIST binutils-2.35.1-patches-1.tar.xz 10088 BLAKE2B fa4b0c417b6452757f90243921c60b2406c9bf60d1aaa393654fb23ce52e32fb3e7ed90f6d59286786dd95398a10d008c75bfdca065d704025cc828ff65b225f SHA512 dccb4407f4f2a8b38488f9f42638c10777ee344239cf5d4fcc8f580df3e8ff15d03211dc51ef18d905c326a71771da4b38f47381d6d549422a8353b5da0e7b0b +DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e941535f992150d86f25201cadd07b63daaa36bf76b07dc0aa8a4837da17d1672feb47a7b15f83efdeec5409e695965a10142147a SHA512 b704ebe82c4402f058f9c96991a89256a6b369d28f844bf020ed2c77766894d9a2ca0596cd609de7b389fa8cd52bfab674b6deb10ea2096e50aa57921be2083e DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb -EBUILD binutils-2.32-r1.ebuild 12638 BLAKE2B 3bb6831d91295ad0e1eba8f50de8d5ceea51f245b2798cf890b2e0d42628db175150d4372f918067e560d229c2173412662320c90b39d3ab99f69fb1c9c4e18e SHA512 e4c24268b2bb5780bdbaaee7d7b7a02fbf590afb95b11037e1b518fd5c98e94ac8b25e60d188609d98dc30180e030f44ec78e1ef7ce1162fe13658fbe057b340 -EBUILD binutils-2.32-r2.ebuild 12417 BLAKE2B 0db121dfdf5af96c1884684ab0d8a25d69c037d8b394a8d364f742ded9962f96c4e94f5073294c41eaefb0b9061b58b4f78f86ae04c73bd13797b3de5d3e3c4d SHA512 abbf2690b78b9c74c8db40db03a0de41afdf9006120b2d32014c53b064ff3872813c2a35d610e5dc5b50324613395ff8dbd6f9e0811fc09003efd830c748d459 -EBUILD binutils-2.33.1-r1.ebuild 12152 BLAKE2B 71c89261848ff7d8898c81cd013de9bd9fac9f3853732fb4636c6e420106b74d3f42970d2dc25c2053a71003d898377618fb2c6ef271f993302f3f5c1f4d3d54 SHA512 689498a68f0e802c1468ee3a4df6dfe8ede15dfa797d1983466d01e64f5da26c071f1396d52f25085e5df4075cb2969349f0533eb89a543da224c6c3ed47d4b9 -EBUILD binutils-2.34-r2.ebuild 12119 BLAKE2B 9ffb2d93bb543e023bdada09eb459b39a2f182816e0f2a0e28e376fe2984eddd1d3a1130fa8a1f2eb716f619c3ed04d6df3e440657246bf6510ff53f370b88f8 SHA512 75eb38babbda8ac3afeb82e7893e42d502aea41d9ac6b0874dacfe3cc3c12c9c50fe9f77d4bea0d7c3772906047bfd97846c2aa97e5be87fcf43e5771d2b72b7 +EBUILD binutils-2.32-r1.ebuild 12354 BLAKE2B 1771cb776e87efa9b0ad69a78df051db44b2078e323645ce185815987a540ffd4e82ed2ae5b3d92ffa3837f117ec7737188b9920f59b8b5e0f55cda03afbf888 SHA512 4233627432a43ab46dac5e10d90a07dc9e085455f3140fb0a731fdb1ef2bfd2245dae3c47e9ba32bdb7a8650f32e7a9f49b911999ee32a18d41c32be4c697fcd +EBUILD binutils-2.32-r2.ebuild 12173 BLAKE2B fb2dd9286d25b3e9b6bfbebfd70965e72b0458b3d87830be8f8e2f14866818441118f809392c34f2ea535d2f54821c3460108ed71bbd9e78286cad1190a669c3 SHA512 cb442d2e13a2c33fd3e89cd948b5bfbb453d7f37ba18cd061c21c69fceb8cdcfb047d4b009d1ec5d6f3d90c37ad9fa30cdfaf2422ccc6c410720ee0989c11cae +EBUILD binutils-2.33.1-r1.ebuild 11908 BLAKE2B 7d4a576a037a162d329977822aa08807115e7d6775df73a047bc1c82bdf1cfb3a7f51e31c21c2682553673dca8bbb5db0359a65f3f9722fe751b7871b2bcf91a SHA512 2837ab896d900e9dbb19e7d5584bede1fa19e50ba0dc432d02644ee4c8c791a1219b6fb35213b5e8f50d2d11d24ac1cb393cfd2db20346e7eafc23a8a0da82a7 +EBUILD binutils-2.34-r2.ebuild 11872 BLAKE2B efb68c0c189489561a6d90eb72016f0872f503eb5cd846091fa29361fa843b2e8e15f572c1244d7be244360d599c3c36cf1726642694e0e7d5dd0debf1aef488 SHA512 cbe9447d81fc67e89519042129f2dbab8c4274ad52a915e1c9065507ef335d87d57f361a5b81e81bd892089a83822a9e46b72f38db9668a17a1462337b976cc7 +EBUILD binutils-2.35.1-r1.ebuild 12468 BLAKE2B 43658cefb152986e42607766f8b263b53b66cea2fd6cb5f6933ad616e4a8a612f2fad907a10fe3aa675b6ffc8810d03f3a70253eae0a00b78a2734ee85ea7165 SHA512 2feeeea71ad8f112284067407fcae8c02850608f6ec246971e4ac6a0ac496397475c2122be830c8578fd3464dd3654858de76985d111c45678121bf0379aa0a0 EBUILD binutils-2.35.1.ebuild 12468 BLAKE2B 92daee225625599510aec7656338a8a91853c4541cfc75b0f72ed2814941ad3765f51bab88b694543e180b9e0f88799fcff680ea24140b511145ffd0d4f2ac5d SHA512 fa18f03f24cb6880ad1ef246fe382a33187d822b571c7183418a228721578f4cf9cd1807524c04594dd5ac342c8b7bfcbe0c82135d196e2ae025d40016b48f08 EBUILD binutils-9999.ebuild 12469 BLAKE2B f99ef61b216d5e1948898a1f79aa35a7e8dc439240b6ce9cca8cd88e9a11497e2a937930c3ef31b3d844c180f2352cb33d98c189d4ec8aa46d24e38a80b089f9 SHA512 6cf1f15697a42b4931e1bcf1180ed658ef975df3053b16c41acdebf2c200075b11583aa4a2d20fb84ff6b8d3c1c3744c37317117ba6235b024df080059fe17c9 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2 diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild index 1ae297d7ea13..3daa17a457bc 100644 --- a/sys-devel/binutils/binutils-2.32-r1.ebuild +++ b/sys-devel/binutils/binutils-2.32-r1.ebuild @@ -33,15 +33,6 @@ case ${PV} in EGIT_CHECKOUT_DIR=${S} SLOT=${PV} ;; - *.9999) - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" - inherit git-r3 - S=${WORKDIR}/binutils - EGIT_CHECKOUT_DIR=${S} - EGIT_BRANCH=$(get_version_component_range 1-2) - EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" - SLOT=$(get_version_component_range 1-2) - ;; *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(get_version_component_range 1-2) diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild index ef860c0fe8c3..d4de5f2ce4b3 100644 --- a/sys-devel/binutils/binutils-2.32-r2.ebuild +++ b/sys-devel/binutils/binutils-2.32-r2.ebuild @@ -30,15 +30,6 @@ case ${PV} in EGIT_CHECKOUT_DIR=${S} SLOT=${PV} ;; - *.9999) - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" - inherit git-r3 - S=${WORKDIR}/binutils - EGIT_CHECKOUT_DIR=${S} - EGIT_BRANCH=$(ver_cut 1-2) - EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" - SLOT=$(ver_cut 1-2) - ;; *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(ver_cut 1-2) diff --git a/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sys-devel/binutils/binutils-2.33.1-r1.ebuild index c0f31907a70b..fe16e589ba71 100644 --- a/sys-devel/binutils/binutils-2.33.1-r1.ebuild +++ b/sys-devel/binutils/binutils-2.33.1-r1.ebuild @@ -30,15 +30,6 @@ case ${PV} in EGIT_CHECKOUT_DIR=${S} SLOT=${PV} ;; - *.9999) - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" - inherit git-r3 - S=${WORKDIR}/binutils - EGIT_CHECKOUT_DIR=${S} - EGIT_BRANCH=$(ver_cut 1-2) - EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" - SLOT=$(ver_cut 1-2) - ;; *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(ver_cut 1-2) diff --git a/sys-devel/binutils/binutils-2.34-r2.ebuild b/sys-devel/binutils/binutils-2.34-r2.ebuild index 672f3cc3c5a5..517ec9a28bee 100644 --- a/sys-devel/binutils/binutils-2.34-r2.ebuild +++ b/sys-devel/binutils/binutils-2.34-r2.ebuild @@ -30,19 +30,10 @@ case ${PV} in EGIT_CHECKOUT_DIR=${S} SLOT=${PV} ;; - *.9999) - EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" - inherit git-r3 - S=${WORKDIR}/binutils - EGIT_CHECKOUT_DIR=${S} - EGIT_BRANCH=$(ver_cut 1-2) - EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch" - SLOT=$(ver_cut 1-2) - ;; *) SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" SLOT=$(ver_cut 1-2) - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86" ;; esac diff --git a/sys-devel/binutils/binutils-2.35.1-r1.ebuild b/sys-devel/binutils/binutils-2.35.1-r1.ebuild new file mode 100644 index 000000000000..57dc7a307c1c --- /dev/null +++ b/sys-devel/binutils/binutils-2.35.1-r1.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils libtool flag-o-matic gnuconfig multilib toolchain-funcs + +DESCRIPTION="Tools necessary to build programs" +HOMEPAGE="https://sourceware.org/binutils/" +LICENSE="GPL-3+" +IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test vanilla" +REQUIRED_USE="default-gold? ( gold )" + +# Variables that can be set here (ignored for live ebuilds) +# PATCH_VER - the patchset version +# Default: empty, no patching +# PATCH_BINUTILS_VER - the binutils version in the patchset name +# - Default: PV +# PATCH_DEV - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/... +# for the patchsets + +PATCH_VER=2 +PATCH_DEV=dilfridge + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + SLOT=${PV} +else + PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}} + PATCH_DEV=${PATCH_DEV:-slyfox} + SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz" + [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI} + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz" + SLOT=$(ver_cut 1-2) + # live ebuild + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +# +# The cross-compile logic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi +is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; } + +# +# The dependencies +# +RDEPEND=" + >=sys-devel/binutils-config-3 + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( sys-apps/texinfo ) + test? ( dev-util/dejagnu ) + nls? ( sys-devel/gettext ) + sys-devel/flex + virtual/yacc +" + +RESTRICT="!test? ( test )" + +MY_BUILDDIR=${WORKDIR}/build + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git + git-r3_src_unpack + mv patches-git/9999 patch || die + + EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git" + S=${WORKDIR}/binutils + EGIT_CHECKOUT_DIR=${S} + git-r3_src_unpack + else + unpack ${P}.tar.xz + + cd "${WORKDIR}" || die + unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz + fi + + cd "${WORKDIR}" || die + mkdir -p "${MY_BUILDDIR}" || die +} + +src_prepare() { + local patchsetname + if [[ ${PV} == 9999* ]] ; then + patchsetname="from git master" + else + patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}" + fi + + if [[ ! -z ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then + if ! use vanilla; then + einfo "Applying binutils patchset ${patchsetname}" + eapply "${WORKDIR}/patch" + einfo "Done." + fi + fi + + # This check should probably go somewhere else, like pkg_pretend. + if [[ ${CTARGET} == *-uclibc* ]] ; then + if grep -qs 'linux-gnu' "${S}"/ltconfig ; then + die "sorry, but this binutils doesn't yet support uClibc :(" + fi + fi + + # Make sure our explicit libdir paths don't get clobbered. #562460 + sed -i \ + -e 's:@bfdlibdir@:@libdir@:g' \ + -e 's:@bfdincludedir@:@includedir@:g' \ + {bfd,opcodes}/Makefile.in || die + + # Fix locale issues if possible #122216 + if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then + einfo "Fixing misc issues in configure files" + for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do + ebegin " Updating ${f/${S}\/}" + patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \ + || eerror "Please file a bug about this" + eend $? + done + fi + + # Fix conflicts with newer glibc #272594 + if [[ -e libiberty/testsuite/test-demangle.c ]] ; then + sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c + fi + + # Apply things from PATCHES and user dirs + default + + # Run misc portage update scripts + gnuconfig_update + elibtoolize --portage --no-uclibc +} + +toolchain-binutils_bugurl() { + printf "https://bugs.gentoo.org/" +} +toolchain-binutils_pkgversion() { + printf "Gentoo ${PV}" + [[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}" +} + +src_configure() { + # Setup some paths + LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV} + INCPATH=${LIBPATH}/include + DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV} + if is_cross ; then + TOOLPATH=/usr/${CHOST}/${CTARGET} + else + TOOLPATH=/usr/${CTARGET} + fi + BINPATH=${TOOLPATH}/binutils-bin/${PV} + + # Make sure we filter $LINGUAS so that only ones that + # actually work make it through #42033 + strip-linguas -u */po + + # Keep things sane + strip-flags + + local x + echo + for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do + einfo "$(printf '%10s' ${x}:) ${!x}" + done + echo + + cd "${MY_BUILDDIR}" + local myconf=() + + if use plugins ; then + myconf+=( --enable-plugins ) + fi + # enable gold (installed as ld.gold) and ld's plugin architecture + if use gold ; then + myconf+=( --enable-gold ) + if use default-gold; then + myconf+=( --enable-gold=default ) + fi + fi + + if use nls ; then + myconf+=( --without-included-gettext ) + else + myconf+=( --disable-nls ) + fi + + myconf+=( --with-system-zlib ) + + # For bi-arch systems, enable a 64bit bfd. This matches + # the bi-arch logic in toolchain.eclass. #446946 + # We used to do it for everyone, but it's slow on 32bit arches. #438522 + case $(tc-arch) in + ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;; + esac + + use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd ) + + [[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} ) + + is_cross && myconf+=( + --with-sysroot="${EPREFIX}"/usr/${CTARGET} + --enable-poison-system-directories + ) + + # glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+ + # on everyone in alpha (for now), we'll just enable it when possible + has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt ) + has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt ) + + # mips can't do hash-style=gnu ... + if [[ $(tc-arch) != mips ]] ; then + myconf+=( --enable-default-hash-style=gnu ) + fi + + myconf+=( + --prefix="${EPREFIX}"/usr + --host=${CHOST} + --target=${CTARGET} + --datadir="${EPREFIX}"${DATAPATH} + --datarootdir="${EPREFIX}"${DATAPATH} + --infodir="${EPREFIX}"${DATAPATH}/info + --mandir="${EPREFIX}"${DATAPATH}/man + --bindir="${EPREFIX}"${BINPATH} + --libdir="${EPREFIX}"${LIBPATH} + --libexecdir="${EPREFIX}"${LIBPATH} + --includedir="${EPREFIX}"${INCPATH} + --enable-obsolete + --enable-shared + --enable-threads + # Newer versions (>=2.27) offer a configure flag now. + --enable-relro + # Newer versions (>=2.24) make this an explicit option. #497268 + --enable-install-libiberty + # Available from 2.35 on + --enable-textrel-check=warning + --disable-werror + --with-bugurl="$(toolchain-binutils_bugurl)" + --with-pkgversion="$(toolchain-binutils_pkgversion)" + $(use_enable static-libs static) + ${EXTRA_ECONF} + # Disable modules that are in a combined binutils/gdb tree. #490566 + --disable-{gdb,libdecnumber,readline,sim} + # Strip out broken static link flags. + # https://gcc.gnu.org/PR56750 + --without-stage1-ldflags + # Change SONAME to avoid conflict across + # {native,cross}/binutils, binutils-libs. #666100 + --with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st) + ) + echo ./configure "${myconf[@]}" + "${S}"/configure "${myconf[@]}" || die + + # Prevent makeinfo from running if doc is unset. + if ! use doc ; then + sed -i \ + -e '/^MAKEINFO/s:=.*:= true:' \ + Makefile || die + fi +} + +src_compile() { + cd "${MY_BUILDDIR}" + # see Note [tooldir hack for ldscripts] + emake tooldir="${EPREFIX}${TOOLPATH}" all + + # only build info pages if the user wants them + if use doc ; then + emake info + fi + + # we nuke the manpages when we're left with junk + # (like when we bootstrap, no perl -> no manpages) + find . -name '*.1' -a -size 0 -delete +} + +src_test() { + cd "${MY_BUILDDIR}" + + # bug 637066 + filter-flags -Wall -Wreturn-type + + emake -k check +} + +src_install() { + local x d + + cd "${MY_BUILDDIR}" + # see Note [tooldir hack for ldscripts] + emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install + rm -rf "${ED}"/${LIBPATH}/bin + use static-libs || find "${ED}" -name '*.la' -delete + + # Newer versions of binutils get fancy with ${LIBPATH} #171905 + cd "${ED}"/${LIBPATH} + for d in ../* ; do + [[ ${d} == ../${PV} ]] && continue + mv ${d}/* . || die + rmdir ${d} || die + done + + # Now we collect everything intp the proper SLOT-ed dirs + # When something is built to cross-compile, it installs into + # /usr/$CHOST/ by default ... we have to 'fix' that :) + if is_cross ; then + cd "${ED}"/${BINPATH} + for x in * ; do + mv ${x} ${x/${CTARGET}-} + done + + if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then + mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH} + mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/usr/${CHOST}/{include,lib} + fi + fi + insinto ${INCPATH} + local libiberty_headers=( + # Not all the libiberty headers. See libiberty/Makefile.in:install_to_libdir. + demangle.h + dyn-string.h + fibheap.h + hashtab.h + libiberty.h + objalloc.h + splay-tree.h + ) + doins "${libiberty_headers[@]/#/${S}/include/}" + if [[ -d ${ED}/${LIBPATH}/lib ]] ; then + mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ + rm -r "${ED}"/${LIBPATH}/lib + fi + + # Generate an env.d entry for this binutils + insinto /etc/env.d/binutils + cat <<-EOF > "${T}"/env.d + TARGET="${CTARGET}" + VER="${PV}" + LIBPATH="${EPREFIX}${LIBPATH}" + EOF + newins "${T}"/env.d ${CTARGET}-${PV} + + # Handle documentation + if ! is_cross ; then + cd "${S}" + dodoc README + docinto bfd + dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO + docinto binutils + dodoc binutils/ChangeLog binutils/NEWS binutils/README + docinto gas + dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README* + docinto gprof + dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl + docinto ld + dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO + docinto libiberty + dodoc libiberty/ChangeLog* libiberty/README + docinto opcodes + dodoc opcodes/ChangeLog* + fi + + # Remove shared info pages + rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} + + # Trim all empty dirs + find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null +} + +pkg_postinst() { + # Make sure this ${CTARGET} has a binutils version selected + [[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0 + binutils-config ${CTARGET}-${PV} +} + +pkg_postrm() { + local current_profile=$(binutils-config -c ${CTARGET}) + + # If no other versions exist, then uninstall for this + # target ... otherwise, switch to the newest version + # Note: only do this if this version is unmerged. We + # rerun binutils-config if this is a remerge, as + # we want the mtimes on the symlinks updated (if + # it is the same as the current selected profile) + if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then + local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}') + choice=${choice//$'\n'/ } + choice=${choice/* } + if [[ -z ${choice} ]] ; then + binutils-config -u ${CTARGET} + else + binutils-config ${choice} + fi + elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then + binutils-config ${CTARGET}-${PV} + fi +} + +# Note [slotting support] +# ----------------------- +# Gentoo's layout for binutils files is non-standard as Gentoo +# supports slotted installation for binutils. Many tools +# still expect binutils to reside in known locations. +# binutils-config package restores symlinks into known locations, +# like: +# /usr/bin/${CTARGET}-<tool> +# /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips +# /usr/include/ +# +# Note [tooldir hack for ldscripts] +# --------------------------------- +# Build system does not allow ./configure to tweak every location +# we need for slotting binutils hence all the shuffling in +# src_install(). This note is about SCRIPTDIR define handling. +# +# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value +# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib' +# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time. +# Thus we can't just move files around after compilation finished. +# +# Our goal is the following: +# - at build-time set scriptdir to point to symlinked location: +# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case) +# - at install-time set scriptdir to point to slotted location: +# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV} diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest index f2c753882653..4ba308b185c8 100644 --- a/sys-devel/bison/Manifest +++ b/sys-devel/bison/Manifest @@ -4,10 +4,12 @@ DIST bison-3.6.3-patches-01.tar.xz 10316 BLAKE2B a99e12e69334371316e5841f8c86ed7 DIST bison-3.6.4.tar.xz 2472456 BLAKE2B d2efe7ff1a349efe5a8c79eb69aa296dbc7eb9fde549afc91986460f27976e033dd793e904dda2f919f11e011ff6c458805288dff4939dcd1ee20e2b316cb9e6 SHA512 041cd87f4ca6b012031719a49aa81e62d3c0817c6364289732e6a3cb9a0762498760e0f2ce84c03ca9e9b74eb74bdffd1b8b86d2b4a6e4a0d8c8a4b864b672dc DIST bison-3.7.1-patches-01.tar.xz 11072 BLAKE2B e68dc42fdeebd9c530d04ba906fb49dec3f2df0a68186a54de9671564ee47f9adc9ca4cb167ddaa3e15458dd339570191b2fe6debb33fdf47f29d1a7aa8d868f SHA512 d167f5278cf3136a96450b2bd664b2563c94205d7c82298951b0b08a6b4b0733101e25636f905c8d4033b5e6d1aaaddab70b7772c28e8c1d6c31a05e23df7ce5 DIST bison-3.7.1.tar.xz 2605940 BLAKE2B a00e8af6a74100154d2dad1597c901f8473dbdcc57826eff947878c3568bfc9070d92857b3b3e349302e9fcfd67eb3287e7a04f6fcff3b897a6fecf43c1cd03d SHA512 9c4097b6ff26e819be14a9d4ef39f6f259c04627cd305e11da8e67897a369b2bba5ce96bf19fa5f6088670e90a9c5bc5c45172f8f482252aeec546b285dd0797 -DIST bison-3.7.2-patches-02.tar.xz 99664 BLAKE2B 8f719265d16b42f398beef9ff9fde01c5f86d301421f64f8ac801cbc55af8d1258e1ae0f90e67b4de7bb8b25e99480acacc73815534f25e116f2f2b920ee9697 SHA512 bd99762a1f244755499efb400d2bb4399a5d21126eff253533b7f1320c8a4cd8513485cd176c90932029d720369182eb595ff36fa32ccaaa8d7048e46921e79b -DIST bison-3.7.2.tar.xz 2613404 BLAKE2B 7543c7df4496fbe6b9ab18ffb643a0d58eb63d0d1e91d67eaa6f9a7c805180c1cef02a640fd41eec228782a6758f82058dc4a45c13e3730b740883efad77498d SHA512 42eb501c246e9b4b24cb212c8da538b11b1944b997314105e67f88f22d73b7d00cf19b21e086aa7523630a2a24e1fd70a89d85a7e3003783990e08d31f711a27 +DIST bison-3.7.3-patches-01.tar.xz 11336 BLAKE2B 2648dacd99c64c366946dad34f9e5fd838b43257df47bf74e3a3b63b03099152b4884d9b1c5943ee5c47afb090369278874c5f2b40dfa69b3abfa4eaa556843f SHA512 a53d541a550cc45f6c677fb6fa830640b64ba2c9a4ab4e6aef1f52ecd5fa38501e2391707d66c2958dd7a139dfba74ae5734e80d15360a3aa544fdea8ecf5500 +DIST bison-3.7.3.tar.xz 2613028 BLAKE2B a6f1063fb9441ae9102b29dc2786b7eb7104f7f13288d537080c26e7982e63f7a954abf1903f2a79a88578d88e9f3c30da8dcf12b7d6c89de0b60943186332c7 SHA512 34fe630749dc015f15a830ad13742c4b0b9163143a11e987c16954bee0451e819ec2fa7b43bd34c867e5ce72c758eb9070348d1d581c9435b9531a99caa46eed +DIST bison-3.7.4.tar.xz 2617336 BLAKE2B e49a4a6fba1dc93314133541c24c6619b465a81850d6b8c4ff63074df46fa7d6e1d9645797c14be32a87c0ffee6830b24e49137b6357d3284d736b407fe7d118 SHA512 3fc13ab21e28218afc9b7f1196a5607de7ff4403c4126df359848422a8057ac6c17ce4344864dd320b7c47a08d98e0f3e2929f25b06be3b1f1c867c0568f367c EBUILD bison-3.1.ebuild 2482 BLAKE2B 2595a1242d213c2839fd7cf1d3a069b666d3915d1e86a4903ee35136be9018bc5d0a960c9e4c24927c9f0573d76802a764ab8da9157ab399dd000238d196760c SHA512 97f27e6390787b602ad7aad377e1d8313d58036e7b3f3acb141b009bd8327839e2cac72ae3231d8ffed5fbaeb66298c356834956c8ea5665d1b0e674751457db -EBUILD bison-3.6.4.ebuild 2484 BLAKE2B bd124013721e70456fa448f2e005a704e046d6290ef7f1eb42e848771f8f2390edfa6195b5be882104e390d1339fbb0d7e4474e7f9b189ab3b5809d29d16451a SHA512 6342a604c9644fb06c75bca03da99946b7d6eb2d8d25a96bc0e57a7de22af839075db0f7eaf64fc631d30467ba26c852317ed5c83791ecdf41adfa1f9c7d1375 -EBUILD bison-3.7.1-r1.ebuild 2594 BLAKE2B 2b37b0a55bfea9e68efe1296aa1bfe55497c00cfa53b421d4d4e754800d28b289fa5f336329a60bbd574b99da83167c081f7fee5387ec90808f764c2cb860daa SHA512 60ab97e903eb60ab350048893db116202666981dea0e23aa470c7e12db378f060168d535d95274732454a2d16beea091eae1c2efec117756e521462add970886 -EBUILD bison-3.7.2.ebuild 2502 BLAKE2B fc64923ec5a985c362c70f525f98752665ea5e7fa08360a839599f11b30d1dda5e8e5b25e0b168246e2be2d3324457c0edc21f6181ca46d54f0faee5bd5a7a28 SHA512 d17d9393bc3623067291a6b8400d9e93a17754ae6c1300cce824cb9dcfcc95c0c6f2a5f4ee1d70748e09d0205f8ecc2621d120d9e43babdae0818892db7dc2b3 +EBUILD bison-3.6.4.ebuild 2456 BLAKE2B 3d5bf57304e3cc58529ab940baa619b0300592dffcd9de892afb694a0efe1e023e10960998418c2bea6f06f8438eb6a59772da67f077040b4f13b61a64e55cc1 SHA512 4034360fdeb456588bc8e0c86709efb1cdd4e775c484fecb93c5d0f804229f108d0470fad4f3964ba18cfb6d4a268c775dc159548a30ebfe238ce846191d4b2d +EBUILD bison-3.7.1-r1.ebuild 2564 BLAKE2B 39e2951e7b56da27efe14877358c2f290cca25c60a4beda65854edc4923b10ed8e51074dffa8578ae03ab6c673fd07d1345269e30b296cdc7fa4d3ab7a0a106c SHA512 b377a5c91dfc518f51778d9ff81b5410b7631cf7c3a24618ecb21e1b80084afbe2f8a128bfbae0c753f72ea1bc1f2640624755316737294158a445646151f09c +EBUILD bison-3.7.3.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282 +EBUILD bison-3.7.4.ebuild 2472 BLAKE2B eb303a11c93c006e1c90ba0b7f1fdf00f7ba5220d2b7ac64b49e1206cf43fd76f07dfd4a44f323e39a6eea666fa4e5ae858e9bee398e0b497d0cfe813adac68f SHA512 c4b89e95de226dfe0f74b366ce65ff27bd58a48b50e55c4fc1df776c5f4d6b7cd88b6ce1e182a70987b56be4041231ffd6fc517a4f363ab932163fa2344da282 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/bison/bison-3.6.4.ebuild b/sys-devel/bison/bison-3.6.4.ebuild index 471513e39d76..4247649b27f7 100644 --- a/sys-devel/bison/bison-3.6.4.ebuild +++ b/sys-devel/bison/bison-3.6.4.ebuild @@ -10,7 +10,6 @@ PATCHES="${PN}-3.6.3-patches-01.tar.xz" DESCRIPTION="A general-purpose (yacc-compatible) parser generator" HOMEPAGE="https://www.gnu.org/software/bison/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${PATCHES} https://dev.gentoo.org/~whissi/dist/bison/${PATCHES} https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCHES}" diff --git a/sys-devel/bison/bison-3.7.1-r1.ebuild b/sys-devel/bison/bison-3.7.1-r1.ebuild index 03e84b97c73a..a7ca15209937 100644 --- a/sys-devel/bison/bison-3.7.1-r1.ebuild +++ b/sys-devel/bison/bison-3.7.1-r1.ebuild @@ -10,7 +10,6 @@ PATCH_TAR="${PN}-3.7.1-patches-01.tar.xz" DESCRIPTION="A general-purpose (yacc-compatible) parser generator" HOMEPAGE="https://www.gnu.org/software/bison/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${PATCH_TAR} https://dev.gentoo.org/~whissi/dist/bison/${PATCH_TAR} https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCH_TAR}" diff --git a/sys-devel/bison/bison-3.7.2.ebuild b/sys-devel/bison/bison-3.7.3.ebuild index e23f6ca6bef4..8a91a8bc81aa 100644 --- a/sys-devel/bison/bison-3.7.2.ebuild +++ b/sys-devel/bison/bison-3.7.3.ebuild @@ -5,12 +5,11 @@ EAPI=7 inherit flag-o-matic -PATCH_TAR="${PN}-3.7.2-patches-02.tar.xz" +PATCH_TAR="${PN}-3.7.3-patches-01.tar.xz" DESCRIPTION="A general-purpose (yacc-compatible) parser generator" HOMEPAGE="https://www.gnu.org/software/bison/" SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - mirror://gentoo/${PATCH_TAR} https://dev.gentoo.org/~whissi/dist/bison/${PATCH_TAR} https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCH_TAR}" diff --git a/sys-devel/bison/bison-3.7.4.ebuild b/sys-devel/bison/bison-3.7.4.ebuild new file mode 100644 index 000000000000..8a91a8bc81aa --- /dev/null +++ b/sys-devel/bison/bison-3.7.4.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +PATCH_TAR="${PN}-3.7.3-patches-01.tar.xz" + +DESCRIPTION="A general-purpose (yacc-compatible) parser generator" +HOMEPAGE="https://www.gnu.org/software/bison/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + https://dev.gentoo.org/~whissi/dist/bison/${PATCH_TAR} + https://dev.gentoo.org/~polynomial-c/dist/bison/${PATCH_TAR}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="examples nls static test" +RESTRICT="!test? ( test )" + +# gettext _IS_ required in RDEPEND because >=bison-3.7 links against +# libtextstyle.so!!! (see bug #740754) +DEPEND=" + >=sys-devel/m4-1.4.16 + >=sys-devel/gettext-0.21 +" +RDEPEND="${DEPEND}" +BDEPEND=" + sys-devel/flex + examples? ( dev-lang/perl ) + test? ( dev-lang/perl ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-1998 PACKAGING README-alpha README-release + +src_prepare() { + # Record date to avoid 'config.status --recheck' & regen of 'tests/package.m4' + touch -r configure.ac old.configure.ac || die + touch -r configure old.configure || die + + eapply "${WORKDIR}"/patches + default + + # Restore date after patching + touch -r old.configure.ac configure.ac || die + touch -r old.configure configure || die + + # The makefiles make the man page depend on the configure script + # which we patched above. Touch it to prevent regeneration. + touch doc/bison.1 || die #548778 #538300#9 + + # Avoid regenerating the info page when the timezone is diff. #574492 + sed -i '2iexport TZ=UTC' build-aux/mdate-sh || die +} + +src_configure() { + use static && append-ldflags -static + + local myeconfargs=( + $(use_enable examples) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # This one is installed by dev-util/yacc + mv "${ED}"/usr/bin/yacc{,.bison} || die + mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die + + # We do not need liby.a + rm -r "${ED}"/usr/lib* || die +} + +pkg_postinst() { + local f="${EROOT}/usr/bin/yacc" + if [[ ! -e ${f} ]] ; then + ln -s yacc.bison "${f}" + fi +} + +pkg_postrm() { + # clean up the dead symlink when we get unmerged #377469 + local f="${EROOT}/usr/bin/yacc" + if [[ -L ${f} && ! -e ${f} ]] ; then + rm -f "${f}" + fi +} diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest index 881e00565b6c..7ec06a66c90c 100644 --- a/sys-devel/clang-common/Manifest +++ b/sys-devel/clang-common/Manifest @@ -1,13 +1,11 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 -DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f -DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD clang-common-10.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f -EBUILD clang-common-10.0.1.ebuild 586 BLAKE2B 662709a5185c65cfc72a20874193ec64fb14f697818a11f89bb59289b98cef9a3a34d178aaa9d8e55dd000a6576a6781cf7d94c335c4362f1952fbf7e4983e1a SHA512 a9bc61165d69104a671904f959fa824cb4c0d82f7f316a903f7e6c9a7748d01fd37c7d5ab09a8632a3c45354188b645456b4a7d9f8297a4eebe93b7533ee66eb +EBUILD clang-common-10.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f EBUILD clang-common-11.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd -EBUILD clang-common-11.0.0_rc3.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd -EBUILD clang-common-11.0.0_rc4.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd +EBUILD clang-common-11.0.0.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f EBUILD clang-common-12.0.0.9999.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd EBUILD clang-common-9.0.1.ebuild 584 BLAKE2B f9fca7b49c818a9918c199e0b12f2e73c5b7828c61a32506806591a374e8f90143a4af80eb809e7cc381773901a8b889f7cd76eb1c771b19932fc6d5797d983f SHA512 2ba5111a5c93bbde3beff601fd6a7dc5da6672a2d40afcea4fa09735c058aa4b23e9f07b90a939f9dbe6215df2760e6b1d2c2d1cf2b3695caf91139869ba672f MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/sys-devel/clang-common/clang-common-10.0.1.ebuild b/sys-devel/clang-common/clang-common-10.0.1.ebuild index 8e0af08ae31c..636965492422 100644 --- a/sys-devel/clang-common/clang-common-10.0.1.ebuild +++ b/sys-devel/clang-common/clang-common-10.0.1.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" PDEPEND="sys-devel/clang:*" diff --git a/sys-devel/clang-common/clang-common-11.0.0_rc3.ebuild b/sys-devel/clang-common/clang-common-11.0.0.ebuild index 18e41e0917da..636965492422 100644 --- a/sys-devel/clang-common/clang-common-11.0.0_rc3.ebuild +++ b/sys-devel/clang-common/clang-common-11.0.0.ebuild @@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" PDEPEND="sys-devel/clang:*" diff --git a/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild b/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild deleted file mode 100644 index 18e41e0917da..000000000000 --- a/sys-devel/clang-common/clang-common-11.0.0_rc4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 llvm.org - -DESCRIPTION="Common files shared between multiple slots of clang" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( clang/utils/bash-autocomplete.sh ) -llvm.org_set_globals -S=${WORKDIR}/clang/utils - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="" - -PDEPEND="sys-devel/clang:*" - -src_install() { - newbashcomp bash-autocomplete.sh clang -} diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest index bf419810c80b..b0655025d4b9 100644 --- a/sys-devel/clang-runtime/Manifest +++ b/sys-devel/clang-runtime/Manifest @@ -1,8 +1,7 @@ EBUILD clang-runtime-10.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f -EBUILD clang-runtime-10.0.1.ebuild 698 BLAKE2B f04b04bcb2e02fe8cfe61089982d9542379da412fd88f31316c5849b445c77bd488cfdfa28c6f5184807939ba9563205428237abc2630d0117c6f8a4a36c3aa4 SHA512 4cc5fef5cb012a1b01016f0c806fb3da85761fd515cc68b3f7bb95f1dde190b4558b9f7794259e267e9de7687af05fb11f709dba0c669d69aacc800c9189ca97 +EBUILD clang-runtime-10.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f EBUILD clang-runtime-11.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97 -EBUILD clang-runtime-11.0.0_rc3.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97 -EBUILD clang-runtime-11.0.0_rc4.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97 +EBUILD clang-runtime-11.0.0.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f EBUILD clang-runtime-12.0.0.9999.ebuild 643 BLAKE2B d40d0fe357437cd1953be01751c4f31b0545bd48df6130aa0ffbd5b8cce5826ae1bf721e74fcf60b98528f402a734862f9ae495710e72c2d236741191e845dd3 SHA512 a70d29e6ee013f5eaebaa004655617f221ca47457d99f5b6b99ef1fd3c5ee1b0d082267c6436a34d523ebb96a5f9746f4659baa2f8241946be08517c9a5d6d97 EBUILD clang-runtime-9.0.1.ebuild 696 BLAKE2B 33e5cb1f40aab7aeb82ad7fe9e0106a7d4f0c33269b642e5447f37e6f2c3c6491d353178a9148c14e6456e2b310b5ff4fb9ca5ad4263fe850d8a31ecfba4da9a SHA512 e2874bd54d4e312a54a6b6381c4decd990ee7c0d9004b9197607bcd57189e00908cbb021be4d6089cb46794142a9d22c07f4b228a6e58ddcaad97637ed4a763f MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild index bf06303c0c19..04d3897324e8 100644 --- a/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-10.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="$(ver_cut 1-3)" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc3.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild index 2713d1f397ff..04d3897324e8 100644 --- a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc3.ebuild +++ b/sys-devel/clang-runtime/clang-runtime-11.0.0.ebuild @@ -11,10 +11,9 @@ SRC_URI="" LICENSE="metapackage" SLOT="$(ver_cut 1-3)" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+compiler-rt libcxx openmp +sanitize" REQUIRED_USE="sanitize? ( compiler-rt )" -PROPERTIES="live" RDEPEND=" compiler-rt? ( diff --git a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild b/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild deleted file mode 100644 index 2713d1f397ff..000000000000 --- a/sys-devel/clang-runtime/clang-runtime-11.0.0_rc4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-build - -DESCRIPTION="Meta-ebuild for clang runtime libraries" -HOMEPAGE="https://clang.llvm.org/" -SRC_URI="" - -LICENSE="metapackage" -SLOT="$(ver_cut 1-3)" -KEYWORDS="" -IUSE="+compiler-rt libcxx openmp +sanitize" -REQUIRED_USE="sanitize? ( compiler-rt )" -PROPERTIES="live" - -RDEPEND=" - compiler-rt? ( - ~sys-libs/compiler-rt-${PV}:${SLOT} - sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} ) - ) - libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )" diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index cb5d22e5adb0..4d6d90df97e8 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -1,18 +1,18 @@ -AUX 10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650 AUX 10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch 970 BLAKE2B 564394bea7e9d5a056e7ce39b3e5261f1214637084c1669d34e4d9c3296582732765654ccc2dd76507df2d7fb8406da4185339134fa52bb5c38a2335a55b4f50 SHA512 41050092b31b2558b2d24665f4b5b5bde8b7d50b979c21d57c6e59119dcfa95c3616b873214a8e986268a20436c0895b702547adeb44d6d7576c89de1ba2d587 AUX 8.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533 +DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650 DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7 +DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc +DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 -DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f -DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD clang-10.0.0.ebuild 10366 BLAKE2B af2fc9f454038f9fbf552a217b8534d3c6fe74cac3bb58b167c96bdf3249e213dd64fc469a0f29f51a0dbf3e46c1dfdfdfb7680288df4fa13b21021d9a120102 SHA512 8e83ea9ff93c88c0d9fe3db936a8f2949413cab513ab675e936146130885ee26234174985e7616f1a830c9cb9c2b1c560f686570909115c4fbaccd7ba911ca28 -EBUILD clang-10.0.1.ebuild 11405 BLAKE2B 9ab0e63b50869afd35272f6028ff129d145f22d57309681800329c5cf42a9423552f80f6d7678a5ccceb164d7c1a8f5250403318068c1ee496da1fabe0a8f4de SHA512 50e2f617e8a1186f8000da61bfc27f80981df9284708fe8eae9c144cb2b3bae536b45834965a7195f160feaa6f07f339249f7271aee29eecc5ad6c2198b433b3 -EBUILD clang-11.0.0.9999.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa -EBUILD clang-11.0.0_rc3.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa -EBUILD clang-11.0.0_rc4.ebuild 11181 BLAKE2B 6b8a194faf777d0be720847059c268146608e22e86c99e3d2e127017f86a29c8278ea7d527e37d310f8604b66d17722abea18f1ff079a56c27fd82fa228bc71e SHA512 08bf959cf04b092fbb75b278e6dff2bb45c18c2d8fe0166e9da9c12f376b8c4a3a28704c0ab65406de144c8ffe8d325dbba815b3047afc1bff127f21abc1aafa -EBUILD clang-12.0.0.9999.ebuild 11215 BLAKE2B 63ad3811c2942c22bd3b4a2e9b0550096175514f005e9e7df0730de06daed8b3cf0591a1b0cd1d098ed38491be6cb93f1e5ea2825d12254a61cb703b836dcebf SHA512 e290d7a08d01e8bdbe9e39613166e54c6b25f8d3084e444a47c215e11809ef4760fe7cdfd26955ce52bf17d5e341a3c7e825f96a0aae26c6b6a0754c18b88cbb +EBUILD clang-10.0.1.ebuild 11792 BLAKE2B cb044c8d17a8dbbe069acde03b2c91a8ea185f9a155b9d086c53a2b9c6e3730840f3122eaba006fa09e80c790ac00d0ba34d4def3e393850d8d4442a21a7b769 SHA512 3cc0f3ebdb0ca89fe201184bd7d7545a44a44969ed3142c2de7616e4ef6b120220323b90d62faf69a385e7426c08937661627db1434f1d6291032e50f7728097 +EBUILD clang-11.0.0.9999.ebuild 11494 BLAKE2B c02b255c4440b6c035bb52979cd4a14f1eb22264590b1f61a7f2d4a4ccd1ed79d768daef8264f91493f7a300ef75840a6f7aac55b7dfc4c5fd87b1af485afe96 SHA512 8a29ba42101bd3dfb6951a2947dc57945c24bd9276a8159ed82aec56fc432ffcab02db5fa9bdab744b1d73e1c96b49d02e520f7c451670ba051923b586eba62a +EBUILD clang-11.0.0.ebuild 11539 BLAKE2B fa949a59925b4e9d1044021a5b0346926c585056571bed6d66c720cd6c3a1e7a57f81e02132295a63346fa130a633eb7960d6cbb54c9cf2c0cf0cea96b1c6bdb SHA512 0ba29b7d29ad59b944540f324381cfb25512242c3e998d15fb62e5526dd6dc9625812562ef328a593cdf190d5a9bb8eafe4a922039aebe29aad4ae2e11fdfe0c +EBUILD clang-12.0.0.9999.ebuild 11429 BLAKE2B 8403c223a3fdeb851eb6be9c190730101013f370f9d9172ac03a08e93d342d729ed453ca527ccdfb12750c71813f1a9cb0a23298a8db5fc9ab3c38b9b2fa6130 SHA512 141978ca93729ace58bb0973dd25a8560411523daaab3e404a7b11c1ccf6908eec08939054700f1d2e7b7e2493e85a141eaf7c3022e30134bc24c0f0ac5b96a9 EBUILD clang-9.0.1.ebuild 8982 BLAKE2B 05319c777c4ecfd03a54bc9e14f322ad6f348a99554ebf8eb1e3a0a1b8c7aba5f3ba618fd3edb21022dd34f1cd4dca2c3f24b152b6f795b939a77c8959d27fa1 SHA512 f88f6c0dc7f1faed0f0d8310c9235a4d0d17352f710f28d9a8c7e47e28aaa43f7727e3e2a7e30334ffae7cb2e6df7769a543fd4c79a0ecb8a1f0a480b15fdb06 MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c diff --git a/sys-devel/clang/clang-10.0.1.ebuild b/sys-devel/clang/clang-10.0.1.ebuild index 96f2e13b419f..42c03f5c3c62 100644 --- a/sys-devel/clang/clang-10.0.1.ebuild +++ b/sys-devel/clang/clang-10.0.1.ebuild @@ -9,7 +9,9 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" +SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch" LLVM_COMPONENTS=( clang clang-tools-extra ) +LLVM_MANPAGES=pregenerated LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} @@ -29,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux" IUSE="debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -43,7 +45,7 @@ RDEPEND=" ${PYTHON_DEPS}" DEPEND="${RDEPEND}" BDEPEND=" - dev-python/sphinx + doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) ${PYTHON_DEPS}" RDEPEND="${RDEPEND} @@ -69,7 +71,7 @@ PDEPEND=" PATCHES=( # fix simultaneous linking to .a and dylib - "${FILESDIR}"/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch + "${DISTDIR}"/10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch "${FILESDIR}"/10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch ) @@ -116,7 +118,7 @@ check_distribution_components() { ;; # conditional to USE=doc docs-clang-html|docs-clang-tools-html) - continue + use doc || continue ;; esac @@ -196,11 +198,15 @@ get_distribution_components() { find-all-symbols modularize pp-trace - - # manpages - docs-clang-man - docs-clang-tools-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-clang-man + docs-clang-tools-man + ) + fi use doc && out+=( docs-clang-html @@ -259,16 +265,23 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( # normally copied from LLVM_INCLUDE_DOCS but the latter # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=ON - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF + -DCLANG_INCLUDE_DOCS=${build_docs} + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} ) else mycmakeargs+=( @@ -389,6 +402,7 @@ multilib_src_install_all() { fi docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages # match 'html' non-compression use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" # +x for some reason; TODO: investigate diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild index 8f5be4425a42..a66c3ab97393 100644 --- a/sys-devel/clang/clang-11.0.0.9999.ebuild +++ b/sys-devel/clang/clang-11.0.0.9999.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( clang clang-tools-extra ) +LLVM_MANPAGES=build LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} @@ -44,7 +45,8 @@ RDEPEND=" ${PYTHON_DEPS}" DEPEND="${RDEPEND}" BDEPEND=" - dev-python/sphinx + >=dev-util/cmake-3.16 + doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) ${PYTHON_DEPS}" RDEPEND="${RDEPEND} @@ -111,7 +113,7 @@ check_distribution_components() { ;; # conditional to USE=doc docs-clang-html|docs-clang-tools-html) - continue + use doc || continue ;; esac @@ -190,11 +192,15 @@ get_distribution_components() { find-all-symbols modularize pp-trace - - # manpages - docs-clang-man - docs-clang-tools-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-clang-man + docs-clang-tools-man + ) + fi use doc && out+=( docs-clang-html @@ -246,6 +252,8 @@ multilib_src_configure() { -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) + + -DPython3_EXECUTABLE="${PYTHON}" ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" @@ -253,16 +261,23 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( # normally copied from LLVM_INCLUDE_DOCS but the latter # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=ON - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF + -DCLANG_INCLUDE_DOCS=${build_docs} + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} ) else mycmakeargs+=( @@ -383,6 +398,7 @@ multilib_src_install_all() { fi docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages # match 'html' non-compression use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" # +x for some reason; TODO: investigate diff --git a/sys-devel/clang/clang-11.0.0_rc3.ebuild b/sys-devel/clang/clang-11.0.0.ebuild index 8f5be4425a42..a7451bfd4bde 100644 --- a/sys-devel/clang/clang-11.0.0_rc3.ebuild +++ b/sys-devel/clang/clang-11.0.0.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( clang clang-tools-extra ) +LLVM_MANPAGES=pregenerated LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} @@ -30,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux" IUSE="debug default-compiler-rt default-libcxx default-lld doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -44,7 +45,8 @@ RDEPEND=" ${PYTHON_DEPS}" DEPEND="${RDEPEND}" BDEPEND=" - dev-python/sphinx + >=dev-util/cmake-3.16 + doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) ${PYTHON_DEPS}" RDEPEND="${RDEPEND} @@ -111,7 +113,7 @@ check_distribution_components() { ;; # conditional to USE=doc docs-clang-html|docs-clang-tools-html) - continue + use doc || continue ;; esac @@ -190,11 +192,15 @@ get_distribution_components() { find-all-symbols modularize pp-trace - - # manpages - docs-clang-man - docs-clang-tools-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-clang-man + docs-clang-tools-man + ) + fi use doc && out+=( docs-clang-html @@ -246,6 +252,8 @@ multilib_src_configure() { -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) + + -DPython3_EXECUTABLE="${PYTHON}" ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" @@ -253,16 +261,23 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( # normally copied from LLVM_INCLUDE_DOCS but the latter # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=ON - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF + -DCLANG_INCLUDE_DOCS=${build_docs} + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} ) else mycmakeargs+=( @@ -383,6 +398,7 @@ multilib_src_install_all() { fi docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages # match 'html' non-compression use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" # +x for some reason; TODO: investigate diff --git a/sys-devel/clang/clang-11.0.0_rc4.ebuild b/sys-devel/clang/clang-11.0.0_rc4.ebuild deleted file mode 100644 index 8f5be4425a42..000000000000 --- a/sys-devel/clang/clang-11.0.0_rc4.ebuild +++ /dev/null @@ -1,408 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multilib-minimal pax-utils \ - python-single-r1 toolchain-funcs - -DESCRIPTION="C language family frontend for LLVM" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( clang clang-tools-extra ) -LLVM_TEST_COMPONENTS=( - llvm/lib/Testing/Support - llvm/utils/{lit,llvm-lit,unittest} - llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} -) -llvm.org_set_globals - -# Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -# MSVCSetupApi.h: MIT -# sorttable.js: MIT - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="" -IUSE="debug default-compiler-rt default-libcxx default-lld - doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] - static-analyzer? ( dev-lang/perl:* ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-python/sphinx - xml? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - !<sys-devel/llvm-4.0.0_rc:0 - !sys-devel/clang:0" -PDEPEND=" - sys-devel/clang-common - ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) - default-libcxx? ( >=sys-libs/libcxx-${PV} ) - default-lld? ( sys-devel/lld )" - -# Multilib notes: -# 1. ABI_* flags control ABIs libclang* is built for only. -# 2. clang is always capable of compiling code for all ABIs for enabled -# target. However, you will need appropriate crt* files (installed -# e.g. by sys-devel/gcc and sys-libs/glibc). -# 3. ${CHOST}-clang wrappers are always installed for all ABIs included -# in the current profile (i.e. alike supported by sys-devel/gcc). -# -# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need -# multilib clang* libraries (not runtime, not wrappers). - -pkg_setup() { - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - # create extra parent dir for relative CLANG_RESOURCE_DIR access - mkdir -p x/y || die - BUILD_DIR=${WORKDIR}/x/y/clang - - llvm.org_src_prepare - - mv ../clang-tools-extra tools/extra || die -} - -check_distribution_components() { - if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then - local all_targets=() my_targets=() l - cd "${BUILD_DIR}" || die - - while read -r l; do - if [[ ${l} == install-*-stripped:* ]]; then - l=${l#install-} - l=${l%%-stripped*} - - case ${l} in - # meta-targets - clang-libraries|distribution) - continue - ;; - # headers for clang-tidy static library - clang-tidy-headers) - continue - ;; - # tools - clang|clangd|clang-*) - ;; - # static libraries - clang*|findAllSymbols) - continue - ;; - # conditional to USE=doc - docs-clang-html|docs-clang-tools-html) - continue - ;; - esac - - all_targets+=( "${l}" ) - fi - done < <(ninja -t targets all) - - while read -r l; do - my_targets+=( "${l}" ) - done < <(get_distribution_components $"\n") - - local add=() remove=() - for l in "${all_targets[@]}"; do - if ! has "${l}" "${my_targets[@]}"; then - add+=( "${l}" ) - fi - done - for l in "${my_targets[@]}"; do - if ! has "${l}" "${all_targets[@]}"; then - remove+=( "${l}" ) - fi - done - - if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then - eqawarn "get_distribution_components() is outdated!" - eqawarn " Add: ${add[*]}" - eqawarn "Remove: ${remove[*]}" - fi - cd - >/dev/null || die - fi -} - -get_distribution_components() { - local sep=${1-;} - - local out=( - # common stuff - clang-cmake-exports - clang-headers - clang-resource-headers - libclang-headers - - # libs - clang-cpp - libclang - ) - - if multilib_is_native_abi; then - out+=( - # common stuff - bash-autocomplete - libclang-python-bindings - - # tools - c-index-test - clang - clang-format - clang-offload-bundler - clang-offload-wrapper - clang-refactor - clang-rename - clang-scan-deps - diagtool - hmaptool - - # extra tools - clang-apply-replacements - clang-change-namespace - clang-doc - clang-include-fixer - clang-move - clang-query - clang-reorder-fields - clang-tidy - clangd - find-all-symbols - modularize - pp-trace - - # manpages - docs-clang-man - docs-clang-tools-man - ) - - use doc && out+=( - docs-clang-html - docs-clang-tools-html - ) - - use static-analyzer && out+=( - clang-check - clang-extdef-mapping - scan-build - scan-view - ) - fi - - printf "%s${sep}" "${out[@]}" -} - -multilib_src_configure() { - local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1-3 "${llvm_version}") - - local mycmakeargs=( - -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - # relative to bindir - -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}" - - -DBUILD_SHARED_LIBS=OFF - -DCLANG_LINK_CLANG_DYLIB=ON - -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) - - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - # these are not propagated reliably, so redefine them - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - - # override default stdlib and rtlib - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") - -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") - - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - ) - use test && mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - # normally copied from LLVM_INCLUDE_DOCS but the latter - # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=ON - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - else - mycmakeargs+=( - -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - - if [[ -n ${EPREFIX} ]]; then - mycmakeargs+=( - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" - ) - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - - # LLVM can have very high memory consumption while linking, - # exhausting the limit on 32-bit linker executable - use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure - - multilib_is_native_abi && check_distribution_components -} - -multilib_src_compile() { - cmake_build distribution - - # provide a symlink for tests - if [[ ! -L ${WORKDIR}/lib/clang ]]; then - mkdir -p "${WORKDIR}"/lib || die - ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake_build check-clang - multilib_is_native_abi && - cmake_build check-clang-tools check-clangd -} - -src_install() { - MULTILIB_WRAPPED_HEADERS=( - /usr/include/clang/Config/config.h - ) - - multilib-minimal_src_install - - # Move runtime headers to /usr/lib/clang, where they belong - mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die - # move (remaining) wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die - - # Apply CHOST and version suffix to clang tools - # note: we use two version components here (vs 3 in runtime path) - local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1 "${llvm_version}") - local clang_full_version=$(ver_cut 1-3 "${llvm_version}") - local clang_tools=( clang clang++ clang-cl clang-cpp ) - local abi i - - # cmake gives us: - # - clang-X - # - clang -> clang-X - # - clang++, clang-cl, clang-cpp -> clang - # we want to have: - # - clang-X - # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X - # - clang, clang++, clang-cl, clang-cpp -> clang*-X - # also in CHOST variant - for i in "${clang_tools[@]:1}"; do - rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die - dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" - dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" - done - - # now create target symlinks for all supported ABIs - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") - for i in "${clang_tools[@]}"; do - dosym "${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}" - dosym "${abi_chost}-${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}" - done - done - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD; then - rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-distribution - - # move headers to /usr/include for wrapping & ABI mismatch checks - # (also drop the version suffix from runtime headers) - rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die -} - -multilib_src_install_all() { - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view - fi - - docompress "/usr/lib/llvm/${SLOT}/share/man" - # match 'html' non-compression - use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" - # +x for some reason; TODO: investigate - use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1" -} - -pkg_postinst() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi - - elog "You can find additional utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang" - elog "Some of them are vim integration scripts (with instructions inside)." - elog "The run-clang-tidy.py script requires the following additional package:" - elog " dev-python/pyyaml" -} - -pkg_postrm() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow clean all - fi -} diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild index 1f2944a6e1d5..a186693b4e0e 100644 --- a/sys-devel/clang/clang-12.0.0.9999.ebuild +++ b/sys-devel/clang/clang-12.0.0.9999.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm llvm.org multilib-minimal pax-utils \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( clang clang-tools-extra ) +LLVM_MANPAGES=build LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/{lit,llvm-lit,unittest} @@ -18,7 +19,7 @@ LLVM_TEST_COMPONENTS=( llvm.org_set_globals # Keep in sync with sys-devel/llvm -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE ) ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) @@ -44,7 +45,8 @@ RDEPEND=" ${PYTHON_DEPS}" DEPEND="${RDEPEND}" BDEPEND=" - dev-python/sphinx + >=dev-util/cmake-3.16 + doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) ${PYTHON_DEPS}" RDEPEND="${RDEPEND} @@ -109,7 +111,7 @@ check_distribution_components() { ;; # conditional to USE=doc docs-clang-html|docs-clang-tools-html) - continue + use doc || continue ;; esac @@ -188,11 +190,15 @@ get_distribution_components() { find-all-symbols modularize pp-trace - - # manpages - docs-clang-man - docs-clang-tools-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-clang-man + docs-clang-tools-man + ) + fi use doc && out+=( docs-clang-html @@ -244,6 +250,8 @@ multilib_src_configure() { -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) + + -DPython3_EXECUTABLE="${PYTHON}" ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" @@ -251,17 +259,21 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DLLVM_BUILD_DOCS=ON + -DLLVM_ENABLE_SPHINX=ON + -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi mycmakeargs+=( -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra - # normally copied from LLVM_INCLUDE_DOCS but the latter - # is lacking value in stand-alone builds - -DCLANG_INCLUDE_DOCS=ON - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=ON - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - -DSPHINX_WARNINGS_AS_ERRORS=OFF + -DCLANG_INCLUDE_DOCS=${build_docs} + -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} ) else mycmakeargs+=( @@ -382,6 +394,7 @@ multilib_src_install_all() { fi docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages # match 'html' non-compression use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" # +x for some reason; TODO: investigate diff --git a/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch b/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch deleted file mode 100644 index d01bd5d51e23..000000000000 --- a/sys-devel/clang/files/10.0.1/0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch +++ /dev/null @@ -1,788 +0,0 @@ -From 248d706ca72666a203a24b84406be430ccf40558 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 16 Jun 2020 20:43:55 +0200 -Subject: [PATCH 3/4] [clang-tools-extra] Prevent linking to duplicate .a libs - and dylib - -Fix various tool libraries not to link to clang's .a libraries and dylib -simultaneously. This may cause breakage, in particular through -duplicate command-line option declarations. ---- - .../clang-apply-replacements/CMakeLists.txt | 4 +++- - .../clang-change-namespace/CMakeLists.txt | 4 +++- - clang-tools-extra/clang-doc/CMakeLists.txt | 4 +++- - .../clang-include-fixer/CMakeLists.txt | 6 +++++- - .../find-all-symbols/CMakeLists.txt | 4 +++- - clang-tools-extra/clang-move/CMakeLists.txt | 4 +++- - clang-tools-extra/clang-query/CMakeLists.txt | 4 +++- - .../clang-reorder-fields/CMakeLists.txt | 4 +++- - clang-tools-extra/clang-tidy/CMakeLists.txt | 7 +++++-- - clang-tools-extra/clang-tidy/abseil/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/android/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/boost/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/bugprone/CMakeLists.txt | 10 +++++++--- - clang-tools-extra/clang-tidy/cert/CMakeLists.txt | 12 ++++++++---- - .../clang-tidy/cppcoreguidelines/CMakeLists.txt | 14 +++++++++----- - clang-tools-extra/clang-tidy/darwin/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/fuchsia/CMakeLists.txt | 10 +++++++--- - clang-tools-extra/clang-tidy/google/CMakeLists.txt | 10 +++++++--- - clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt | 14 +++++++++----- - .../clang-tidy/linuxkernel/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/llvm/CMakeLists.txt | 10 +++++++--- - clang-tools-extra/clang-tidy/misc/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/modernize/CMakeLists.txt | 10 +++++++--- - clang-tools-extra/clang-tidy/mpi/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/objc/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/openmp/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/performance/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/plugin/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/portability/CMakeLists.txt | 8 ++++++-- - .../clang-tidy/readability/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clang-tidy/utils/CMakeLists.txt | 6 +++++- - clang-tools-extra/clang-tidy/zircon/CMakeLists.txt | 8 ++++++-- - clang-tools-extra/clangd/CMakeLists.txt | 11 +++++++---- - clang-tools-extra/clangd/unittests/CMakeLists.txt | 1 - - 34 files changed, 188 insertions(+), 73 deletions(-) - -diff --git a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt -index 5bfdcb487e1..27383b488e4 100644 ---- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt -+++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt -@@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS - - add_clang_library(clangApplyReplacements - lib/Tooling/ApplyReplacements.cpp -+) - -- LINK_LIBS -+clang_target_link_libraries(clangApplyReplacements -+ PRIVATE - clangAST - clangBasic - clangRewrite -diff --git a/clang-tools-extra/clang-change-namespace/CMakeLists.txt b/clang-tools-extra/clang-change-namespace/CMakeLists.txt -index 178306423eb..dccfd7c0673 100644 ---- a/clang-tools-extra/clang-change-namespace/CMakeLists.txt -+++ b/clang-tools-extra/clang-change-namespace/CMakeLists.txt -@@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS - - add_clang_library(clangChangeNamespace - ChangeNamespace.cpp -+) - -- LINK_LIBS -+clang_target_link_libraries(clangChangeNamespace -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt -index c301ad5afac..6f303a67c9a 100644 ---- a/clang-tools-extra/clang-doc/CMakeLists.txt -+++ b/clang-tools-extra/clang-doc/CMakeLists.txt -@@ -14,8 +14,10 @@ add_clang_library(clangDoc - Representation.cpp - Serialize.cpp - YAMLGenerator.cpp -+) - -- LINK_LIBS -+clang_target_link_libraries(clangDoc -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers -diff --git a/clang-tools-extra/clang-include-fixer/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/CMakeLists.txt -index f27f7403ea6..d8685cb2075 100644 ---- a/clang-tools-extra/clang-include-fixer/CMakeLists.txt -+++ b/clang-tools-extra/clang-include-fixer/CMakeLists.txt -@@ -11,6 +11,11 @@ add_clang_library(clangIncludeFixer - YamlSymbolIndex.cpp - - LINK_LIBS -+ findAllSymbols -+ ) -+ -+clang_target_link_libraries(clangIncludeFixer -+ PRIVATE - clangAST - clangBasic - clangFormat -@@ -21,7 +26,6 @@ add_clang_library(clangIncludeFixer - clangSerialization - clangTooling - clangToolingCore -- findAllSymbols - ) - - add_subdirectory(plugin) -diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt -index c5fe19bfdbd..06a2324e918 100644 ---- a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt -+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt -@@ -11,8 +11,10 @@ add_clang_library(findAllSymbols - PragmaCommentHandler.cpp - STLPostfixHeaderMap.cpp - SymbolInfo.cpp -+ ) - -- LINK_LIBS -+clang_target_link_libraries(findAllSymbols -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -diff --git a/clang-tools-extra/clang-move/CMakeLists.txt b/clang-tools-extra/clang-move/CMakeLists.txt -index c63127ea325..9ea409932da 100644 ---- a/clang-tools-extra/clang-move/CMakeLists.txt -+++ b/clang-tools-extra/clang-move/CMakeLists.txt -@@ -5,8 +5,10 @@ set(LLVM_LINK_COMPONENTS - add_clang_library(clangMove - Move.cpp - HelperDeclRefGraph.cpp -+ ) - -- LINK_LIBS -+clang_target_link_libraries(clangMove -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers -diff --git a/clang-tools-extra/clang-query/CMakeLists.txt b/clang-tools-extra/clang-query/CMakeLists.txt -index d1d68d502e3..bc76bae9c0e 100644 ---- a/clang-tools-extra/clang-query/CMakeLists.txt -+++ b/clang-tools-extra/clang-query/CMakeLists.txt -@@ -6,8 +6,10 @@ set(LLVM_LINK_COMPONENTS - add_clang_library(clangQuery - Query.cpp - QueryParser.cpp -+ ) - -- LINK_LIBS -+clang_target_link_libraries(clangQuery -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -diff --git a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt -index 9c75d785cc9..e555fd5cdf0 100644 ---- a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt -+++ b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt -@@ -2,8 +2,10 @@ set(LLVM_LINK_COMPONENTS support) - - add_clang_library(clangReorderFields - ReorderFieldsAction.cpp -+) - -- LINK_LIBS -+clang_target_link_libraries(clangReorderFields -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt -index 6dadb271771..329df19f331 100644 ---- a/clang-tools-extra/clang-tidy/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt -@@ -14,8 +14,10 @@ add_clang_library(clangTidy - - DEPENDS - ClangSACheckers -+ ) - -- LINK_LIBS -+clang_target_link_libraries(clangTidy -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers -@@ -31,7 +33,8 @@ add_clang_library(clangTidy - ) - - if(CLANG_ENABLE_STATIC_ANALYZER) -- target_link_libraries(clangTidy PRIVATE -+ clang_target_link_libraries(clangTidy -+ PRIVATE - clangStaticAnalyzerCore - clangStaticAnalyzerFrontend - ) -diff --git a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt -index 3f88da6233f..0f040e56a05 100644 ---- a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt -@@ -22,11 +22,15 @@ add_clang_library(clangTidyAbseilModule - UpgradeDurationConversionsCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyAbseilModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/android/CMakeLists.txt b/clang-tools-extra/clang-tidy/android/CMakeLists.txt -index 9d04003d9bb..d29adc610c8 100644 ---- a/clang-tools-extra/clang-tidy/android/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/android/CMakeLists.txt -@@ -20,10 +20,14 @@ add_clang_library(clangTidyAndroidModule - ComparisonInTempFailureRetryCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyAndroidModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt -index 059f6e91eca..481a709600c 100644 ---- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt -@@ -5,10 +5,14 @@ add_clang_library(clangTidyBoostModule - UseToStringCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyBoostModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt -index 2cb28f4e8f1..d664f5eb875 100644 ---- a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt -@@ -52,13 +52,17 @@ add_clang_library(clangTidyBugproneModule - VirtualNearMissCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyCppCoreGuidelinesModule -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyBugproneModule -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyCppCoreGuidelinesModule -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt -index 66ea2a13acd..75a13349f2f 100644 ---- a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt -@@ -17,10 +17,6 @@ add_clang_library(clangTidyCERTModule - VariadicFunctionDefCheck.cpp - - LINK_LIBS -- clangAST -- clangASTMatchers -- clangBasic -- clangLex - clangTidy - clangTidyBugproneModule - clangTidyGoogleModule -@@ -29,3 +25,11 @@ add_clang_library(clangTidyCERTModule - clangTidyReadabilityModule - clangTidyUtils - ) -+ -+clang_target_link_libraries(clangTidyCERTModule -+ PRIVATE -+ clangAST -+ clangASTMatchers -+ clangBasic -+ clangLex -+ ) -diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt -index 13c15bc9d22..e48bc1c8b1a 100644 ---- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt -@@ -23,15 +23,19 @@ add_clang_library(clangTidyCppCoreGuidelinesModule - SpecialMemberFunctionsCheck.cpp - - LINK_LIBS -- clangAST -- clangASTMatchers -- clangBasic -- clangLex -- clangSerialization - clangTidy - clangTidyMiscModule - clangTidyModernizeModule - clangTidyReadabilityModule - clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyCppCoreGuidelinesModule -+ PRIVATE -+ clangAST -+ clangASTMatchers -+ clangBasic -+ clangLex -+ clangSerialization - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt -index c650efb2a5f..feec79c12bf 100644 ---- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt -@@ -6,11 +6,15 @@ add_clang_library(clangTidyDarwinModule - DispatchOnceNonstaticCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyDarwinModule -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt -index 30b319e7e5a..0148b20f364 100644 ---- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt -@@ -12,11 +12,15 @@ add_clang_library(clangTidyFuchsiaModule - VirtualInheritanceCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyGoogleModule -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyFuchsiaModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyGoogleModule -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/google/CMakeLists.txt b/clang-tools-extra/clang-tidy/google/CMakeLists.txt -index 08368932da5..302561ba646 100644 ---- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/google/CMakeLists.txt -@@ -21,11 +21,15 @@ add_clang_library(clangTidyGoogleModule - UsingNamespaceDirectiveCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyReadabilityModule -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyGoogleModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyReadabilityModule -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt -index 4cf26767f3d..b4c9eb7a445 100644 ---- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt -@@ -8,11 +8,6 @@ add_clang_library(clangTidyHICPPModule - SignedBitwiseCheck.cpp - - LINK_LIBS -- clangAST -- clangASTMatchers -- clangBasic -- clangLex -- clangSerialization - clangTidy - clangTidyBugproneModule - clangTidyCppCoreGuidelinesModule -@@ -23,3 +18,12 @@ add_clang_library(clangTidyHICPPModule - clangTidyReadabilityModule - clangTidyUtils - ) -+ -+clang_target_link_libraries(clangTidyHICPPModule -+ PRIVATE -+ clangAST -+ clangASTMatchers -+ clangBasic -+ clangLex -+ clangSerialization -+ ) -diff --git a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt -index f0e766d30e4..bfcc2ba526d 100644 ---- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt -@@ -5,10 +5,14 @@ add_clang_library(clangTidyLinuxKernelModule - MustCheckErrsCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyLinuxKernelModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt -index c035596b556..bff128cbba7 100644 ---- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt -@@ -9,12 +9,16 @@ add_clang_library(clangTidyLLVMModule - TwineLocalCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyReadabilityModule -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyLLVMModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyReadabilityModule -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt -index 3fc152148d6..37bc2aa5af6 100644 ---- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt -@@ -17,13 +17,17 @@ add_clang_library(clangTidyMiscModule - UnusedUsingDeclsCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyMiscModule -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers - clangBasic - clangLex - clangSerialization -- clangTidy -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt -index 36193f0a6d1..162f44568c5 100644 ---- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt -@@ -36,12 +36,16 @@ add_clang_library(clangTidyModernizeModule - UseUsingCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyReadabilityModule -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyModernizeModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyReadabilityModule -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt -index 5be7b36550a..b36767ac7f3 100644 ---- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt -@@ -6,13 +6,17 @@ add_clang_library(clangTidyMPIModule - TypeMismatchCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyMPIModule -+ PRIVATE - clangAnalysis - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - clangTooling - clangStaticAnalyzerCheckers - ) -diff --git a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt -index 68dda6530f7..3624d2f3ef0 100644 ---- a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt -@@ -9,10 +9,14 @@ add_clang_library(clangTidyObjCModule - SuperSelfCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyObjCModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt -index af95704fd44..d182b29f366 100644 ---- a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt -@@ -8,9 +8,13 @@ add_clang_library(clangTidyOpenMPModule - UseDefaultNoneCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyOpenMPModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt -index d1f9897b015..c9a7e262124 100644 ---- a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt -@@ -18,11 +18,15 @@ add_clang_library(clangTidyPerformanceModule - UnnecessaryValueParamCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyPerformanceModule -+ PRIVATE - clangAST - clangASTMatchers - clangAnalysis - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt -index 4adc3f26977..0bfe122314e 100644 ---- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt -@@ -2,12 +2,16 @@ add_clang_library(clangTidyPlugin - ClangTidyPlugin.cpp - - LINK_LIBS -+ clangTidy -+ ${ALL_CLANG_TIDY_CHECKS} -+ ) -+ -+clang_target_link_libraries(clangTidyPlugin -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangFrontend - clangSema -- clangTidy - clangTooling -- ${ALL_CLANG_TIDY_CHECKS} - ) -diff --git a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt -index 0420a18a2a6..bbe9ccbef1f 100644 ---- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt -@@ -5,11 +5,15 @@ add_clang_library(clangTidyPortabilityModule - SIMDIntrinsicsCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyPortabilityModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt -index 97144af06ca..5af900db5fd 100644 ---- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt -@@ -41,11 +41,15 @@ add_clang_library(clangTidyReadabilityModule - UppercaseLiteralSuffixCheck.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyReadabilityModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - clangTooling - ) -diff --git a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt -index fc383a318b9..5c837ca79aa 100644 ---- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt -@@ -18,11 +18,15 @@ add_clang_library(clangTidyUtils - UsingInserter.cpp - - LINK_LIBS -+ clangTidy -+ ) -+ -+clang_target_link_libraries(clangTidyUtils -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex - clangSema -- clangTidy - clangTransformer - ) -diff --git a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt -index 7aa7cd3f669..71db5e90f25 100644 ---- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt -+++ b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt -@@ -5,10 +5,14 @@ add_clang_library(clangTidyZirconModule - ZirconTidyModule.cpp - - LINK_LIBS -+ clangTidy -+ clangTidyUtils -+ ) -+ -+clang_target_link_libraries(clangTidyZirconModule -+ PRIVATE - clangAST - clangASTMatchers - clangBasic - clangLex -- clangTidy -- clangTidyUtils - ) -diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt -index e3eccb50a49..148043ee9df 100644 ---- a/clang-tools-extra/clangd/CMakeLists.txt -+++ b/clang-tools-extra/clangd/CMakeLists.txt -@@ -110,6 +110,13 @@ add_clang_library(clangDaemon - refactor/Tweak.cpp - - LINK_LIBS -+ clangTidy -+ ${LLVM_PTHREAD_LIB} -+ ${ALL_CLANG_TIDY_CHECKS} -+ ) -+ -+clang_target_link_libraries(clangDaemon -+ PRIVATE - clangAST - clangASTMatchers - clangBasic -@@ -120,15 +127,11 @@ add_clang_library(clangDaemon - clangLex - clangSema - clangSerialization -- clangTidy - clangTooling - clangToolingCore - clangToolingInclusions - clangToolingRefactoring - clangToolingSyntax -- ${LLVM_PTHREAD_LIB} -- ${CLANGD_ATOMIC_LIB} -- ${ALL_CLANG_TIDY_CHECKS} - ) - - add_subdirectory(refactor/tweaks) -diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt -index 62113c6e4bb..6c2b56c93d5 100644 ---- a/clang-tools-extra/clangd/unittests/CMakeLists.txt -+++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt -@@ -103,7 +103,6 @@ target_link_libraries(ClangdTests - PRIVATE - clangDaemon - clangTidy -- LLVMSupport - LLVMTestingSupport - ) - --- -2.27.0 - diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest index 9ca79339b8a2..423e2417d396 100644 --- a/sys-devel/crossdev/Manifest +++ b/sys-devel/crossdev/Manifest @@ -1,4 +1,8 @@ DIST crossdev-20200801.tar.xz 28268 BLAKE2B 36f22a2d1422d5f9e27a5559a8c141462853c4dc011ec98c66d235ef262ea9408fd5054b578963fd17ef630ea63e72c068d216f6ffbea7d191d1374a6ecc4033 SHA512 331af1525cdfc66380621b764bfc63178ce962b9071408d1ee08480caad9c0e4782a8fa5e5f3500fd2ea03ccd322895cc95d80106ad9e5b97a0e09ef5d88c94b +DIST crossdev-20201108.tar.xz 28312 BLAKE2B 2fe86fb7e1b9ed8a3986efcee9bba06a810cf03f00496eee49870e0a9c0a589b8ae461811bf83c76dd22c59e344ddacaeab2ae215aa8f58f3b2e7490399528fc SHA512 28cf1807845c4cc4291c8d576119dbe362ea0f31504ae7a96dbdee636033eab511004b0a8988c4d7425017c3f281b6afa1644db4f9f310a08d69fd7fcd6cdbe0 +DIST crossdev-20201122.tar.xz 28308 BLAKE2B 66da19024dd03e98ff0f388cdb9bf76a968ef4ac920249e9a782d46c1d32a4cb3047a0aa2d9619a054b9894ef30624ce99bb45f9c45b937fbb280a8a298aede8 SHA512 bbd7ab6a8ea0d2cb13f822277d9b8c19478368b2f365aaa60bd2548b47f9e7a582805593b683631ebb20bfb6d2f496f2d3a5eb6d144207fab58607565a8d1a41 EBUILD crossdev-20200801.ebuild 841 BLAKE2B ae015c955b8fae5c400e230ac248395694eaa2ca7653fac637736c577474d55ada854d17709c737340b5982678e4082fbee79b532a41c3f3cf8d0e50ee420c68 SHA512 4cd58d6bd14cd82397ba515aa7ecb04c48fd6be1a9f1d6d26ac7bf9ebc98aa43ca6106e45f149dae1b98cb142eaf949e558365d11f66669bc972de005514eaf5 +EBUILD crossdev-20201108.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9 +EBUILD crossdev-20201122.ebuild 850 BLAKE2B 9992fd02501d3d876f48abb32d8be5a1c6f5842782363ea098a972903c7ae46f92297fc19c50418a7d31087b63ae5b75fea0a974cc1fa0cde7e4cb86446f678e SHA512 5f4d1c246f7bc192d69ee404fb8014efcc0ed52ce6af4cbf0c89d3d287c5c79c4b6dbf922f54cab975c56c8d66035dda1f78dfd39d8e1fa65f59136278179fd9 EBUILD crossdev-99999999.ebuild 856 BLAKE2B 8ec9e78dc63a9bdf766b1010b0953b7da86c164f221fc31058dc0e02e160091241d68d38b75f155bd8c55074019f626e9b0c272899574927f7aec9560207e357 SHA512 bffbd553b032998e649c5b505d1e7758d06d7b6f8b9d25487c8d034884dbe01259585597f731dee3e10a0e3d7bbc2ecab606ae2612fac7e46b03c91f74778490 MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41 diff --git a/sys-devel/crossdev/crossdev-20201108.ebuild b/sys-devel/crossdev/crossdev-20201108.ebuild new file mode 100644 index 000000000000..809478863946 --- /dev/null +++ b/sys-devel/crossdev/crossdev-20201108.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + >=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions +" +DEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sys-devel/crossdev/crossdev-20201122.ebuild b/sys-devel/crossdev/crossdev-20201122.ebuild new file mode 100644 index 000000000000..809478863946 --- /dev/null +++ b/sys-devel/crossdev/crossdev-20201122.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + >=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions +" +DEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index b8de70063fc5..30fd0707bcc6 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -1,8 +1,4 @@ -DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a DIST gcc-config-2.3.2.tar.xz 17444 BLAKE2B c66fd121770dddcb27033be228de691f766f1acd9ada9580ae96dc12f6fbd0cd823e6656dc9b0515d498305b10d72f9cd87cf69388791971e9eac1a20e3f97c9 SHA512 31327d9abd26fdadaaf25a63568fd860ae25030b4a99dcbf0424f2d8fb14e61f041e681eea90c781a3f4e5401e3a7ba3299b1260ceb6e51bda5bef24f65dcacc -DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d -EBUILD gcc-config-2.3.1.ebuild 1464 BLAKE2B e704335a980118a56839939d708b47b221b8919dd0baec30e1947114175cc716c3f674d7596f95246bec6a2498535054cd679e42993a9728150cc6d540e6f640 SHA512 2b94dac6455cadd9a9f502d9dc86df0ef9d13c03b5fa57668a5f8bf4fdfc904460df8ddfff42ba6614386ff088c20fe06ecdcb2c655632a21a487940fa2ec390 -EBUILD gcc-config-2.3.2.ebuild 1472 BLAKE2B 46db37d20da238fc05515c2bc000fcea6261b0f1651b6b8a20c19c2753fbde9661f2b4ba6380008bf144dbde6caf7787d62f935613e1f455a3dc6487c16141ca SHA512 ada2817124fa574984d12e3936db1286ecd57d92f11ac5423f2c8e211ee5f75ccc9819eff0b158b9eb9fa0a8962a524dfabee3d7ab8beb8d7d41ad533bd8cfb5 -EBUILD gcc-config-2.3.ebuild 1468 BLAKE2B 8e21f53264dd75d7a419e940457565a9243265115f56538512f8deeea2b14cf4a703ac5d22ce69d41c7d1d5d1bed5311dc3a0057cdc8fd1f7c96c82b3cf60435 SHA512 5c9bc2b111f1a0eadb1605021291ef0b3bc266102502ca42a823befa687f1f37a7b2b70d0316b058c9036e2df4a6b70748744a6e0cd76bde13c2f3ef94f228a5 -EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b +EBUILD gcc-config-2.3.2-r1.ebuild 1519 BLAKE2B 0c80ef8f3c9f443f3ef5ec53eac602a3bf1b35ea527df07fc3e91307c87209aef921f757e4fc9cb4ad296eea2ee438f9b80752bd5ead2cbaa6f3107853396a44 SHA512 88eedc35a0ff2e6fbff28cf6ad5a50352ebf1ccfb3e4ce458875022a46ae22f0540f034fe39367677cd5b58e897649355d97c801271a30fd29432812a9c4424c +EBUILD gcc-config-9999.ebuild 1528 BLAKE2B 2748dbbcd43c80df61ee32e744059d421691298f696d3db52d51bc8084b72da0971df1bbc22a224713690268453585e9d84ab57de94c6ba7fb25d9807c049986 SHA512 bd50f91b0ea31a175ba83180db0bfb6e3252f8c3afcfe64fe11d4abb7721accb6aebc49288fc9ee4989539adae5fa82fcbc41c0f042c7a625ab600b47806fe52 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935 diff --git a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild index c3b7e7c683c4..f2c2954c4d2b 100644 --- a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild +++ b/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild @@ -10,21 +10,22 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" fi DESCRIPTION="Utility to manage compilers" HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" LICENSE="GPL-2" SLOT="0" -IUSE="+native-symlinks" +IUSE="+cc-wrappers +native-symlinks" RDEPEND=">=sys-apps/gentoo-functions-0.10" _emake() { emake \ - PV="${PV}" \ + PV="${PVR}" \ SUBLIBDIR="$(get_libdir)" \ + USE_CC_WRAPPERS="$(usex cc-wrappers)" \ USE_NATIVE_LINKS="$(usex native-symlinks)" \ TOOLCHAIN_PREFIX="${CHOST}-" \ "$@" diff --git a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2.ebuild deleted file mode 100644 index f18c030a06c7..000000000000 --- a/sys-devel/gcc-config/gcc-config-2.3.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -LICENSE="GPL-2" -SLOT="0" -IUSE="+native-symlinks" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" - -_emake() { - emake \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - USE_NATIVE_LINKS="$(usex native-symlinks)" \ - TOOLCHAIN_PREFIX="${CHOST}-" \ - "$@" -} - -src_compile() { - _emake -} - -src_install() { - _emake DESTDIR="${D}" install -} - -pkg_postinst() { - # Scrub eselect-compiler remains. - # To be removed in 2021. - rm -f "${ROOT}"/etc/env.d/05compiler - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - # To be removed in 2021. - rm -f "${ROOT}"/usr/include/g++{,-v3} - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - # USE flag change can add or delete files in /usr/bin worth recaching - if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi -} diff --git a/sys-devel/gcc-config/gcc-config-2.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild deleted file mode 100644 index dc82652e013b..000000000000 --- a/sys-devel/gcc-config/gcc-config-2.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -fi - -DESCRIPTION="Utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -LICENSE="GPL-2" -SLOT="0" -IUSE="+native-symlinks" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" - -src_compile() { - emake CC="$(tc-getCC)" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - USE_NATIVE_LINKS="$(usex native-symlinks)" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install -} - -pkg_postinst() { - # Scrub eselect-compiler remains. - # To be removed in 2021. - rm -f "${ROOT}"/etc/env.d/05compiler - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - # To be removed in 2021. - rm -f "${ROOT}"/usr/include/g++{,-v3} - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - # USE flag change can add or delete files in /usr/bin worth recaching - if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi -} diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild index e7e08f381b4d..2af22f6a6333 100644 --- a/sys-devel/gcc-config/gcc-config-9999.ebuild +++ b/sys-devel/gcc-config/gcc-config-9999.ebuild @@ -23,7 +23,7 @@ RDEPEND=">=sys-apps/gentoo-functions-0.10" _emake() { emake \ - PV="${PV}" \ + PV="${PVR}" \ SUBLIBDIR="$(get_libdir)" \ USE_CC_WRAPPERS="$(usex cc-wrappers)" \ USE_NATIVE_LINKS="$(usex native-symlinks)" \ diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index b4a9a24356e8..1df03c281a29 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -12,14 +12,10 @@ AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54 AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9 +DIST gcc-10.2.0-patches-3.tar.bz2 22752 BLAKE2B 36880dff2b2f2266c7d971391be758a69b2bc452be664594f289f209b5e4f2c326abc38a4d958d81251ff29f8153182cdc759f76200ef34238dc0c27a6ae0879 SHA512 c441eeca05399f3f97f35e623b814b0091251f23756ed71e2842a49e9b8f17d2053e40c0787242da6c963d333834982786dc4ffffa2d249337d174344d15658e +DIST gcc-10.2.0-patches-4.tar.bz2 23266 BLAKE2B 8173474d3dea27a440b36eb80c89aabb08c37528c3ec2382839c46fc36336aff7f9cdf3dfbc66947df9286b1cfe9f479d615f77d81ab24ff68a3edf5df5b2350 SHA512 17080f358a3f231837de35188ad1a6ae554a4ca6199efae6dacf9b17706937379559d6c8de330b4237480fea6f5cffffc1158c1d5ecc36ec3a7b410546a2684b DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e DIST gcc-11.0.0-patches-4.tar.bz2 12829 BLAKE2B d0e12c09268e096390c3841e466e35bcd66a735536287c80d9713335a65a82c55ade728b487ed549ba1bfa60c9dd95bcad5ae27a86619f2a7c3236fdf457b41b SHA512 010b90b63ac142efeabc1c51287727f472a469a7a25e0576f5bdc380206cf500ae78060da3e97fa46c3fa7288e6cb1b4a2b7b78d7c8704b6db05a23be902e649 -DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 -DIST gcc-5.5.0-patches-4.tar.bz2 31676 BLAKE2B 9fef84a494dc19668f1118733712fcd6bb17725ccb8381ce7906233d2beebaeb6ef579e6ee7e0903c19d50edbce642b861a26a69c8d26c00b7ede2f558d9965a SHA512 5fade4c71ae5c51ae320da267ca3e79f08316e6545776b80a01f4a8d762880953d17ca7afb6319076cad83f90f5b1b6cc7889d2a2968c6a7feb5946d69a1fa15 -DIST gcc-5.5.0-piepatches-v1.tar.bz2 14367 BLAKE2B ce1d288ca4d563cb12e2795dbc9f9c674e451295c75fb4b15b9ba65d3efc8dacea725775cca8c67b581647235b692dd4083e8b158f87c7951bbf6303d8efed43 SHA512 6baf18a7ac6cdc1f93a1a8f87bbbdcc96c68d2b256e82ce04beabdd4ad82b2260e04dbff0850da703fb94bb1f9e13439d2922d7aaae3b12eaa92bc53a89a9398 -DIST gcc-5.5.0-uclibc-patches-1.0.tar.bz2 3518 BLAKE2B b528d79d41de1099f3540c168339350b403568f38a338a5eeaf0a080ebc850cfa390ec72f03a6c61433f2617eaa452ed0c7397a530662188e9a73e5144bd6a1d SHA512 97b97d99fd121642ba7c170c62de245e9f2719dbfae148e0d69f7ee172f84669277f4ef26554fb4cecfab5956587ce50131d92e4244f28f914d1eecd2c361ba5 -DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1 -DIST gcc-6.5.0-patches-4.tar.bz2 12270 BLAKE2B fe985ac4d232b3e237c99d9441ba8fa1ab8e1f223ef93e93580f53fcc54c874d7ce3b1dc0041a9ddbf540f532f32b2ced95c50f412a466c49a7b78fda8d5be0f SHA512 5c51dddbe6787b968bbe358ca6e5d3a18203d2fe59fceae636b820e757b9b91afe52b569d7ef1734077151e1c3f70744cd51f3c840bc050ce41685a345f5cd36 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac DIST gcc-7.5.0-patches-3.tar.bz2 11613 BLAKE2B 84d59103bffaec8fc57e69dbb17f53882935b20c23d54db5f805e8270fa16d8e572ee4a369ecc82d2279cf66a71d1eb2a7f0c9792d4495d2f68946d6b6403f15 SHA512 6e5bea150c56ce3d43c9b0878691ed54ecc5d2a12482e99261efa74af7f1d59ec94c2d0c363792d99e0d3a0abd739d5d06b861da4dea2c1676e5d498b5815d55 @@ -27,14 +23,15 @@ DIST gcc-7.5.0.tar.xz 62783088 BLAKE2B 8a5efeef517a5da1634d063aaa83bf5e002f86acd DIST gcc-8.4.0-patches-2.tar.bz2 16254 BLAKE2B 5ee50ee1a3f6cdb392b370a0f62af7e8fd2fb2cadc46d4faf37ddbae23812a0e9f2e35a4ed6a08c41ffe648c21e9982e965d3ab91f68ae941c6cad74098afa2f SHA512 26fd2ad9f29dfd1db671d4966c16165a6fb75bd74f440871fb41dcb9b6102f07347ae8df67baa9e4d52aec91d3d67803a952b7bd45159fde56e1a1f28237c5eb DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c76660fc17b0475a1164753979563bec25ed46c4e6c718cb9f64c047f57780e8d5be919657a1653f8221c1c9a SHA512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110 +DIST gcc-9.3.0-patches-4.tar.bz2 15474 BLAKE2B b06fdfce4402850bb1c6c211ace4c3a07ad2114ffa48eac58d1624124d5d1bddd6d2b4faa18be3291a340272c022bea26dfcaf17929828ceb6474a5211401389 SHA512 54904a4a1c4a784f1a707cbdd9f6f498457e4aa550dc6f3d6eff71ed05a75685e23e6b71c2a614b1dea7e506b9f42fb0109ecfde00ef00373275bbc0409cb7e0 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de -EBUILD gcc-10.2.0-r1.ebuild 434 BLAKE2B 0a13b431e4ac099cb2ce6a33f35152778097a7f8444ab873bbc35b64284bcf870ea19239d4d0a64a926b9ceaf86cb5c2475528ab5683803b45bf7bec18b9e33c SHA512 1a4f4625297720efa27a50c4b1d96134efd86ed2717fdafa3644090cc957b0635ae8aefacca263a29c5a32770486f8d6b81cce08d10dc0534598b7b3bed72cc8 +EBUILD gcc-10.2.0-r2.ebuild 434 BLAKE2B d25fd7686823cc320c06775c9aaafbe369928332bb7f604e439d0745234ed28206f36772e172bfb8288124ccc5d3b59d84208c4e01a38717fbe15046238bdc1e SHA512 39d34ddfbe00a0614943f4f5c0f0be420d7657694d85145c552bb04e842813cef2c8ef318481af9d71054c7b54b2332e29c626cf8e61e9bc2a120b3aecf54b10 +EBUILD gcc-10.2.0-r3.ebuild 434 BLAKE2B ba1fccc8fa386407cee7f758fa6d0b9b989825f6a796d2d18e90e9fea25f5dbd07ac911e61eb11edc226cc0aebb6b27016d8be008755d7e6a9ec0eb1e35e0169 SHA512 3b24b9f05039720b05ba55e2399f0b6251dbb0cfc15587855ba888620d459cd9f1dc0b49c3df0a49414f0f713c021d800108226a4f88897491c47ff3828d18ff EBUILD gcc-10.2.1_pre9999.ebuild 807 BLAKE2B 08c2172ac50d043050dcfb3d69c138c51fb8d58f2601c14bcbaa4df5d9e844639f0bd345b14a702a86cebb7c420ca4cd831e0b8a995b036e7fd261963663e331 SHA512 0c05fc611f569a49d95d766048f6a1f3972108f7cbf2d03d5dc9a0f0ad29bf1ce4dd2269edabb0912628c9d5e8e377e9be586dbd07f182ebadbe7721a7cd5108 EBUILD gcc-11.0.0_pre9999.ebuild 511 BLAKE2B 6a2aeea8fadc80745e6d7054611c0f877ccd90e8696d22748c7f1ac7c8256c7830a9509afd66e26c0c0dc68bcdce5004cf880fa1960304e5a024ffe3238b0f3e SHA512 e4bced5f4b44310966329d156671a7907adc117f9e58f3fc22dd4599e75a5d53fc06ee029bf1decd3e12d9f5d21eb2049eba5b3a33562e27c96241a5c3cc72b2 -EBUILD gcc-5.5.0.ebuild 1253 BLAKE2B 977028492445b2a30a9c2477cef241ec5fd08fc0b7334d5b0f16d8ca8aaf90288bc336c5961760477ddca362db423b5d7481380c8b62ce068cc6c6d34aa1a642 SHA512 acfb8e42fe2748a30ef96d9a11785c266361d37a5348601f627ca4e942a98f3b797eebc92aca430352aa9d9f3cd65b208d5e8a8c0dc91e2471462638ad69e351 -EBUILD gcc-6.5.0-r2.ebuild 436 BLAKE2B f340e099406e6325e3ace5d179b01f1972acab4482be0af46017d1e55f5fd2a7bf1b8f7e7c7b493084bfbe4fd9c889d51f85d2ddd379f481181e9f645b4eebe7 SHA512 d5c9af31f338affd52e90651d2119bcc9f142d3699f83c5b14b095c8e05b9a1ffcb9d60f464567dee581ca26cf692bd0a611046e93ace8d85676ede02d9166c2 -EBUILD gcc-6.5.0-r3.ebuild 439 BLAKE2B 4c2b8283b6bd0b7104d1be4e11d65a5986e451c9d1f532001532b84538670e48b81f035e3af26e4333e071195ed66476a53439e20470971bef38739a8a7fd385 SHA512 c4b54e30604002d43e1369017fb592aae2668b3bc5b03a1390bb91e59fcc118a3b50f13bfa9f47e50a8ba85109eb2e90a00f652623733633c2d29a393eddd5eb +EBUILD gcc-6.5.0-r3.ebuild 436 BLAKE2B 8b219613160b1d152efeebae97d56e1110473c31949b6c09b9f721afc36c765a8a499fe1ab43ec5e115197f4b9ec3f73cd6cff2d7716993a93353b8556bb5115 SHA512 b83c39a6a99971a0bc4f3ab57b5bc8c5477a1da8fb82a6b56a0dec1e0225761dbdd080606e6abf4b06d56a9b39e766ebac8b347ae56c535f7bf2a381212530ba EBUILD gcc-7.5.0-r1.ebuild 447 BLAKE2B b7465ed897cd3f2c0716e7fc1fe384dd93de4f29a090948857af9cbb04af1acee54557a2185e08852efb63ece42f72bf0c6289ac63f059d31bf32936bcb3dead SHA512 73b7cd1af8c1a45e0303085b95f8fa25831af50ad9999d7268847c970af9ece183dd68334bb0b57a153c8e4ed4ca3baa93c61a4ee6376bbaa944dfd529dd9bdd EBUILD gcc-8.4.0-r1.ebuild 443 BLAKE2B 7263728f3a730bcba73bb779ab11b4951f1171be0a0c0f2dc0efa3299e33cb0880c33d53672d369c2266816aa8f165b0d0295fa66c7fd92779ab80846428640a SHA512 2ea31641f37460d7951767780868c7e4b582531f7e0a0a732f5ce4d981a559b3f0750dd51c8dfc91154da9e4205114353ad883df35b9910d361bccaceaeb5711 EBUILD gcc-9.3.0-r1.ebuild 443 BLAKE2B 0f43c582049ee55a5627d2a05e6dec513b4078d57e322fcadcc917056e840db4bd58dab264f068135569c0f06baf75e95d43302e89b2caf4bf4dac420e052872 SHA512 4efda3a2cbf371a688bfecb74369e7215dec1d5e8b72612f13a50644a884e738842f8ea25aa6800931c39bf0571c8f494972f413cc187b967f9b7a533a4237ad -MISC metadata.xml 2848 BLAKE2B c1c7a91c7a636c4478cdc43daa110d0a3e5830ac632ac6ebfc3867a66f1efdad13d4efe69e91ba3fa1cf26b5dc774926a86e2d8fce933b45c11396d30776e005 SHA512 a7be1673fbae0972c7c9937b6de533f5263d7796e413a2055196c722a2d1f6a79f2b8730f7d7fde5264e4b924f497453efecec09fccf8b7a037c7aa4c54fda7a +EBUILD gcc-9.3.0-r2.ebuild 452 BLAKE2B e9b6c5f96c8d452825d86f41a3e9a089801479c377519d1bf0dc6c23e470bc36236a5c49c8fb0b417b0ab62e789f97d1b9eeb247806b4abd9324f74bd290ccae SHA512 7c058d30cf22863279d29524a59e64ae07e803c2c30142726a8271b097c6f612994d5cad63dab1ac6602a6c8c936f0865afdeaca98dabc66301f4395a4f309ba +MISC metadata.xml 2704 BLAKE2B 3e64655ebe03af9038fa2087b8d929e05136f833fe8667d2e1452a5f5140a1ffa64e39eb7e8e26859cf390d3a2b32842e41fa492697acd8cdac1336a34bba33e SHA512 dc9ec372f6feb99232ab0599351430440b4ddc71e2bf2be1ca4cf235337acfef5443e3ca44f12438f1b0f654b8eaaae66622728f6bcd8f15d3db78374ab781df diff --git a/sys-devel/gcc/gcc-10.2.0-r1.ebuild b/sys-devel/gcc/gcc-10.2.0-r2.ebuild index 2d2ebe50bcea..f6a3a3adee19 100644 --- a/sys-devel/gcc/gcc-10.2.0-r1.ebuild +++ b/sys-devel/gcc/gcc-10.2.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PATCH_VER="2" +PATCH_VER="3" inherit toolchain diff --git a/sys-devel/gcc/gcc-10.2.0-r3.ebuild b/sys-devel/gcc/gcc-10.2.0-r3.ebuild new file mode 100644 index 000000000000..9bda9722f0fc --- /dev/null +++ b/sys-devel/gcc/gcc-10.2.0-r3.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PATCH_VER="4" + +inherit toolchain + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +RDEPEND="" +BDEPEND="${CATEGORY}/binutils" + +src_prepare() { + has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" + toolchain_src_prepare +} diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild deleted file mode 100644 index c7c547b38e50..000000000000 --- a/sys-devel/gcc/gcc-5.5.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PATCH_VER="4" -UCLIBC_VER="1.0" - -# Hardened gcc 4 stuff -PIE_VER="1" -SPECS_VER="0.2.0" -SPECS_GCC_VER="4.4.3" -# arch/libc configurations known to be stable with {PIE,SSP}-by-default -PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64" -PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64" -SSP_STABLE="amd64 x86 mips ppc ppc64 arm" -# uclibc need tls and nptl support for SSP support -# uclibc need to be >= 0.9.33 -SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm" -#end Hardened stuff - -inherit toolchain - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -RDEPEND="" -DEPEND="${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.8 ) - >=${CATEGORY}/binutils-2.20" - -if [[ ${CATEGORY} != cross-* ]] ; then - PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" -fi - -src_prepare() { - if has_version '<sys-libs/glibc-2.12' ; then - ewarn "Your host glibc is too old; disabling automatic fortify." - ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315" - EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" - fi - is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch" - - toolchain_src_prepare -} diff --git a/sys-devel/gcc/gcc-6.5.0-r3.ebuild b/sys-devel/gcc/gcc-6.5.0-r3.ebuild index 6ba0552a039f..1f5abdd961ef 100644 --- a/sys-devel/gcc/gcc-6.5.0-r3.ebuild +++ b/sys-devel/gcc/gcc-6.5.0-r3.ebuild @@ -7,7 +7,7 @@ PATCH_VER="5" inherit toolchain -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/gcc/gcc-6.5.0-r2.ebuild b/sys-devel/gcc/gcc-9.3.0-r2.ebuild index d720fd6569b9..825d34986c99 100644 --- a/sys-devel/gcc/gcc-6.5.0-r2.ebuild +++ b/sys-devel/gcc/gcc-9.3.0-r2.ebuild @@ -7,7 +7,7 @@ PATCH_VER="4" inherit toolchain -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" RDEPEND="" DEPEND="${RDEPEND} diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml index feeacd303176..1a676ab81391 100644 --- a/sys-devel/gcc/metadata.xml +++ b/sys-devel/gcc/metadata.xml @@ -23,8 +23,6 @@ code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag> <flag name="lto">Build using Link Time Optimizations (LTO)</flag> <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag> - <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag> - <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag> <flag name="nptl">Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)</flag> <flag name="objc">Build support for the Objective C code language</flag> <flag name="objc++">Build support for the Objective C++ language</flag> diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 946a79ca3f75..2852a2c46f0f 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -1,9 +1,9 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3 AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3d00891c751c62abe0faedc8a21acd4d97a6bcb0e397f31287b343e01627552c4e3df7fd8635e6b8d39b SHA512 e8219d0dccd192b47daab7de6ec8010ec39192225f29df0443bf54969dd6c39b59889a539a5a9ec0519c512377242a4311f3f3ba4dbbd9d8685ca5e617056ef8 AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d -DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7 +DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 -EBUILD gdb-9.1.ebuild 7426 BLAKE2B 3e945db45755c81c0827b5ba88cd50a973a1b31b2fe1002c6952456305b23e74cf15b5883c66bad0b0dbe5a391cf339d5360a499783fece47a9a40d0b9b3149b SHA512 363f56c0cbcf235005ecfbe46c269bee068d99b75679c92d40e7608c631f0a51eedfd4163f865aae85749b9f994ca166535e711a5d5c7433b491091c6a3263ba -EBUILD gdb-9.2.ebuild 7474 BLAKE2B 19765f828e406a95fc5781a11f30925b0c402fd80780846c58476dca027ed0cb2fe66d881e509c1947dd1d9b58c28d0e9fc175dc32aebc029469642ec582838b SHA512 2a164c4baeb4c356b091fe90e9bbb99b16a6117bc7a63a6810c4ea022216b3579384cedb3a3d291980ada3ea8b90ff7f749d1fcfc92fad907aa4bacffb933d96 -EBUILD gdb-9999.ebuild 7056 BLAKE2B 578a651d684da6f98fd6c0515863c1b90a4c32be826ed469490af1fb4d6b09f43d0a85bbc0bfe9b772e322bcf3598749c6b454d1868a3a6c02c30496995f9f39 SHA512 20277a9dfbf22c6fddf71924098fdb81eeb631bd574b33e674279dc1b13c66476b7cb63d552545a87ab7888473938684adf7ad200346244ba6aee5270bc1cf64 +EBUILD gdb-10.1.ebuild 7076 BLAKE2B cc0cbcde1cbf8c185d5ae39b83090724e413e663e3efd6a6f4482b9c8efa2e07b2e1da1621ad428819cea1898656f7f333c6ea38866b087bdfd2c9696840cde4 SHA512 6897fcde4d5becdad1b97a22ff10595c56aa50ff0d60d277d9f6499cc4b28e69986fbe67bba08341266b481e6bc8791c459993973a8aa43048aecdb0badb975f +EBUILD gdb-9.2.ebuild 7469 BLAKE2B 9fcca08080e8fd0b31e85ad4e292988a13617ec826f0fea442a19b6244f245a6d9c0e3983d20fef97177e3cbe41528f062e21eb7e540f60bc88131576f6d8d06 SHA512 3f4e01a010783d72d68bcf3ffe478fdf1fb46a41b308673b943461651e5c1436fc76e6c7082e7e5611abc2a031e25e0a8b5c553f30e15aff1759c7348663c265 +EBUILD gdb-9999.ebuild 7076 BLAKE2B cc0cbcde1cbf8c185d5ae39b83090724e413e663e3efd6a6f4482b9c8efa2e07b2e1da1621ad428819cea1898656f7f333c6ea38866b087bdfd2c9696840cde4 SHA512 6897fcde4d5becdad1b97a22ff10595c56aa50ff0d60d277d9f6499cc4b28e69986fbe67bba08341266b481e6bc8791c459993973a8aa43048aecdb0badb975f MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild index a9201f627dee..4805e0131ff3 100644 --- a/sys-devel/gdb/gdb-9.1.ebuild +++ b/sys-devel/gdb/gdb-10.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit eutils flag-o-matic python-single-r1 toolchain-funcs @@ -44,7 +44,7 @@ SRC_URI="${SRC_URI} LICENSE="GPL-2 LGPL-2" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" @@ -90,11 +90,8 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-8.3.1-verbose-build.patch - "${FILESDIR}"/${PN}-9.1-ia64.patch ) -GDB_BUILD_DIR="${WORKDIR}"/${P}-build - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -103,6 +100,7 @@ src_prepare() { default strip-linguas -u bfd/po opcodes/po + export CC_FOR_BUILD=$(tc-getBUILD_CC) } gdb_branding() { @@ -139,7 +137,7 @@ src_configure() { if use server && ! use client ; then # just configure+build in the gdbserver subdir to speed things up - cd gdb/gdbserver + cd gdbserver myconf+=( --program-transform-name='' ) else # gdbserver only works for native targets (CHOST==CTARGET). @@ -160,6 +158,7 @@ src_configure() { --disable-install-libiberty # Disable guile for now as it requires guile-2.x #562902 --without-guile + --enable-obsolete # This only disables building in the readline subdir. # For gdb itself, it'll use the system version. --disable-readline @@ -187,28 +186,14 @@ src_configure() { # source-highlight is detected with pkg-config: bug #716558 export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)" - mkdir "${GDB_BUILD_DIR}" || die - pushd "${GDB_BUILD_DIR}" || die - ECONF_SOURCE=${S} - econf "${myconf[@]}" - popd -} - -src_compile() { - emake -C "${GDB_BUILD_DIR}" -} - -src_test() { - emake -C "${GDB_BUILD_DIR}" check + econf "${myconf[@]}" } src_install() { if use server && ! use client; then - emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install - else - emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install + cd gdbserver || die fi - + default if use client; then find "${ED}"/usr -name libiberty.a -delete || die fi @@ -236,7 +221,7 @@ src_install() { # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html # Only install if it exists due to the twisted behavior (see # notes in src_configure above). - [[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay + [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay if use client ; then docinto gdb @@ -247,7 +232,7 @@ src_install() { dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} if use server ; then docinto gdbserver - dodoc gdb/gdbserver/{ChangeLog,README} + dodoc gdbserver/{ChangeLog,README} fi if [[ -n ${PATCH_VER} ]] ; then diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild index db11e62d03ab..cb10cf1b5d50 100644 --- a/sys-devel/gdb/gdb-9.2.ebuild +++ b/sys-devel/gdb/gdb-9.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit eutils flag-o-matic python-single-r1 toolchain-funcs @@ -44,7 +44,7 @@ SRC_URI="${SRC_URI} LICENSE="GPL-2 LGPL-2" SLOT="0" if [[ ${PV} != 9999* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" REQUIRED_USE=" diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index ada72ec65c4d..4805e0131ff3 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) inherit eutils flag-o-matic python-single-r1 toolchain-funcs @@ -100,6 +100,7 @@ src_prepare() { default strip-linguas -u bfd/po opcodes/po + export CC_FOR_BUILD=$(tc-getBUILD_CC) } gdb_branding() { @@ -136,7 +137,7 @@ src_configure() { if use server && ! use client ; then # just configure+build in the gdbserver subdir to speed things up - cd gdb/gdbserver + cd gdbserver myconf+=( --program-transform-name='' ) else # gdbserver only works for native targets (CHOST==CTARGET). @@ -157,6 +158,7 @@ src_configure() { --disable-install-libiberty # Disable guile for now as it requires guile-2.x #562902 --without-guile + --enable-obsolete # This only disables building in the readline subdir. # For gdb itself, it'll use the system version. --disable-readline @@ -189,13 +191,12 @@ src_configure() { src_install() { if use server && ! use client; then - cd gdb/gdbserver || die + cd gdbserver || die fi default if use client; then find "${ED}"/usr -name libiberty.a -delete || die fi - cd "${S}" || die # Delete translations that conflict with binutils-libs. #528088 # Note: Should figure out how to store these in an internal gdb dir. @@ -220,7 +221,7 @@ src_install() { # https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html # Only install if it exists due to the twisted behavior (see # notes in src_configure above). - [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay + [[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay if use client ; then docinto gdb @@ -231,7 +232,7 @@ src_install() { dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING} if use server ; then docinto gdbserver - dodoc gdb/gdbserver/{ChangeLog,README} + dodoc gdbserver/{ChangeLog,README} fi if [[ -n ${PATCH_VER} ]] ; then diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 6575256c7454..104ad462d597 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -1,11 +1,6 @@ AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227 -AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64a29d32ea37b60d87b6a62b90176f64c34fd2a6a2549a47c42d4409cfb26de1b42136d740794d7059f7fce1cf67067104980 SHA512 9f765f34e68b887242d1b727ac36dc8f91ee50a6a0920c2f0697fd3c0d2369cc470e728612441f6cf4b9274ad737d985e3e69aa006adcae21a61a664eea2af38 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 -DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06 -DIST gettext-0.20.2.tar.gz 23717789 BLAKE2B f0db5eacc93501020f31d80e4b11df708d5ce1ae76f9c35587c830c064a4b712284df4645cedf054a41e66ab08d14d080c4fe1d316a108b997207b78148ed579 SHA512 50b0520230dba5da6e04e51b2317e073cacf1536d73ea88e4b5dc6cc5bd97cf2c9a279c3c3ada1067f39c8b3bb0b1ce8e0823cc1dd4c33f4f10860bdf787009d DIST gettext-0.21.tar.gz 24181849 BLAKE2B 2eae99d0916b00b2af6fbc6bf7e309076519a10fea16cd49e7aa29fe8aec1ee7c784c6277281b764dc4abacf400cd3fe461129586303c8cd337db15c76cb4b87 SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 -EBUILD gettext-0.20.1.ebuild 4051 BLAKE2B 7cf8fff49475516e43f9e20e7338f9097fa78bf9814940ec61077af84d7410d38a68d7ca5e5abf665ac5bd9d80e87644209ff3f83cd55c3086799ae78cf848e5 SHA512 6750748e84cc0c8fb6f795083c8df9574957e688646227671928417d0eca990949a5a0c85a4f54867a8829082bea8c3918bf5c571da4d49774e2226cfa5aab86 -EBUILD gettext-0.20.2.ebuild 4055 BLAKE2B a0a734470025aa2672bb1d5e2512a9840de6f2ec6810218084dc9ffdd189f344dfe704540e12f3963077d1405b4a7bba95de90bd77f95af078118b2148187006 SHA512 b8f0e7f37f3504df76ca7d74a1adce503bd0e3f05a36b1087a623932392deb62325bb7b5838869182146f8b8fb3431f0ded741eb2012d2d11abab3957d1fa60b EBUILD gettext-0.21.ebuild 4175 BLAKE2B 070542cc4a7eee31abc4ee3fc81495ccc2f4d3f5f63d9ecd4290724eee7454e48dfa598eb60160ddf60a5cd81fbaafd0008db3f976d53a3ee9bd81a28d91fee6 SHA512 fcbf8c1639c718ba9dfc51e4f1b915997870fbfd905465bd8d0aa4d6fa0d5ec35c125c9bb34592e3d6534eb0a939727f1fcc473b3b8ae5eab9554ed2fbce6f5b MISC metadata.xml 707 BLAKE2B e0f7534d0a90939db1d5b7d0b837d9c0c4ba7cc17ece9dc90e7832580fe62a53ed306a77f86c3205bb96aa46d40834b03143d81076c531eabfc92da82d41e880 SHA512 1951f0165d110a484ed68f774106d6f76f5cad612eb74e0386e8ecbb4e71627668daeda48a779ee6b5daab8b2617145e50ecdb0429c34879278ca14868d40d28 diff --git a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch b/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch deleted file mode 100644 index 16592c8018e0..000000000000 --- a/sys-devel/gettext/files/gettext-0.20-avoid_eautomake.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gettext-0.20/gettext-tools/src/Makefile.in -+++ gettext-0.20/gettext-tools/src/Makefile.in -@@ -3952,9 +3952,16 @@ - - # How to get the include files of libtextstyle. - textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: -- here=`pwd`; \ -- cd ../../libtextstyle/lib && \ -- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" -+ cd "$(abs_top_builddir)/../libtextstyle/lib" && $(MAKE) $@ -+ if test -f "$(abs_top_builddir)/../libtextstyle/lib/$@"; then \ -+ file="$(abs_top_builddir)/../libtextstyle/lib/$@"; \ -+ else \ -+ file="$(abs_top_srcdir)/../libtextstyle/lib/$@"; \ -+ fi; \ -+ target_dir="$(abs_builddir)/$@"; \ -+ target_dir="$${target_dir%/*}"; \ -+ $(MKDIR_P) "$${target_dir}"; \ -+ $(INSTALL_HEADER) "$$file" $@ - - # No need to install libgettextsrc.a, except on AIX. - install-exec-hook: install-exec-clean diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild deleted file mode 100644 index a36da278b93b..000000000000 --- a/sys-devel/gettext/gettext-0.20.1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: Keep version bumps in sync with dev-libs/libintl. - -EAPI=7 - -inherit mono-env libtool java-pkg-opt-2 multilib-minimal - -DESCRIPTION="GNU locale utilities" -HOMEPAGE="https://www.gnu.org/software/gettext/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -# Only libasprintf is under the LGPL (and libintl is in a sep package), -# so put that license behind USE=cxx. -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs" - -# only runtime goes multilib -# Note: The version of libxml2 corresponds to the version bundled via gnulib. -# If the build detects too old of a system version, it will end up falling back -# to the bundled copy. #596918 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We -# would depend on older subslots if they were available (based on the ABIs that -# are explicitly handled), but expat doesn't currently use subslots. -DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.3:= - dev-libs/expat - acl? ( virtual/acl ) - ncurses? ( sys-libs/ncurses:0= ) - java? ( >=virtual/jdk-1.4:= )" -RDEPEND="${DEPEND} - !git? ( cvs? ( dev-vcs/cvs ) ) - git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 )" -BDEPEND=" - git? ( dev-vcs/git ) -" -PDEPEND="emacs? ( app-emacs/po-mode )" - -MULTILIB_WRAPPED_HEADERS=( - # only installed for native ABI - /usr/include/gettext-po.h - - /usr/include/autosprintf.h - /usr/include/textstyle.h - /usr/include/textstyle/stdbool.h - /usr/include/textstyle/version.h - /usr/include/textstyle/woe32dll.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 - "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530 - "${FILESDIR}"/${PN}-0.20-avoid_eautomake.patch -) - -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" - -pkg_setup() { - mono-env_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - default - - elibtoolize -} - -multilib_src_configure() { - local myconf=( - # switches common to runtime and top-level - --cache-file="${BUILD_DIR}"/config.cache - #--docdir="\$(datarootdir)/doc/${PF}" - - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext - # Never build bundled copy of libxml2. - --without-included-libxml - - $(use_enable acl) - $(use_enable cxx c++) - $(use_enable cxx libasprintf) - $(use_with git) - $(usex git --without-cvs $(use_with cvs)) - $(use_enable java) - $(use_enable ncurses curses) - $(use_enable nls) - $(use_enable openmp) - $(use_enable static-libs static) - ) - - local ECONF_SOURCE="${S}" - if ! multilib_is_native_abi ; then - # for non-native ABIs, we build runtime only - ECONF_SOURCE+=/gettext-runtime - fi - - econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - dosym msgfmt /usr/bin/gmsgfmt #43435 - dobin gettext-tools/misc/gettextize - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - if use java ; then - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar - rm "${ED}"/usr/share/${PN}/*.jar || die - rm "${ED}"/usr/share/${PN}/*.class || die - if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 - fi - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - - if use doc ; then - docinto html - dodoc "${ED}"/usr/share/doc/${PF}/*.html - else - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} - fi - rm "${ED}"/usr/share/doc/${PF}/*.html || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} diff --git a/sys-devel/gettext/gettext-0.20.2.ebuild b/sys-devel/gettext/gettext-0.20.2.ebuild deleted file mode 100644 index f84993f9796a..000000000000 --- a/sys-devel/gettext/gettext-0.20.2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: Keep version bumps in sync with dev-libs/libintl. - -EAPI=7 - -inherit mono-env libtool java-pkg-opt-2 multilib-minimal - -DESCRIPTION="GNU locale utilities" -HOMEPAGE="https://www.gnu.org/software/gettext/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -# Only libasprintf is under the LGPL (and libintl is in a sep package), -# so put that license behind USE=cxx. -LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" -IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs" - -# only runtime goes multilib -# Note: The version of libxml2 corresponds to the version bundled via gnulib. -# If the build detects too old of a system version, it will end up falling back -# to the bundled copy. #596918 -# Note: expat lacks a subslot because it is dynamically loaded at runtime. We -# would depend on older subslots if they were available (based on the ABIs that -# are explicitly handled), but expat doesn't currently use subslots. -DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.3:= - dev-libs/expat - acl? ( virtual/acl ) - ncurses? ( sys-libs/ncurses:0= ) - java? ( >=virtual/jdk-1.4:= )" -RDEPEND="${DEPEND} - !git? ( cvs? ( dev-vcs/cvs ) ) - git? ( dev-vcs/git ) - java? ( >=virtual/jre-1.4 )" -BDEPEND=" - git? ( dev-vcs/git ) -" -PDEPEND="emacs? ( app-emacs/po-mode )" - -MULTILIB_WRAPPED_HEADERS=( - # only installed for native ABI - /usr/include/gettext-po.h - - /usr/include/autosprintf.h - /usr/include/textstyle.h - /usr/include/textstyle/stdbool.h - /usr/include/textstyle/version.h - /usr/include/textstyle/woe32dll.h -) - -PATCHES=( - "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 - "${FILESDIR}"/${PN}-0.20-parallel_install.patch #685530 - "${FILESDIR}"/${PN}-0.21_rc1-avoid_eautomake.patch -) - -QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so" - -pkg_setup() { - mono-env_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - java-pkg-opt-2_src_prepare - - default - - elibtoolize -} - -multilib_src_configure() { - local myconf=( - # switches common to runtime and top-level - --cache-file="${BUILD_DIR}"/config.cache - #--docdir="\$(datarootdir)/doc/${PF}" - - # Emacs support is now in a separate package - --without-emacs - --without-lispdir - # glib depends on us so avoid circular deps - --with-included-glib - # libcroco depends on glib which ... ^^^ - --with-included-libcroco - # this will _disable_ libunistring (since it is not bundled), - # see bug #326477 - --with-included-libunistring - # Never build libintl since it's in dev-libs/libintl now. - --without-included-gettext - # Never build bundled copy of libxml2. - --without-included-libxml - - $(use_enable acl) - $(use_enable cxx c++) - $(use_enable cxx libasprintf) - $(use_with git) - $(usex git --without-cvs $(use_with cvs)) - $(use_enable java) - $(use_enable ncurses curses) - $(use_enable nls) - $(use_enable openmp) - $(use_enable static-libs static) - ) - - local ECONF_SOURCE="${S}" - if ! multilib_is_native_abi ; then - # for non-native ABIs, we build runtime only - ECONF_SOURCE+=/gettext-runtime - fi - - econf "${myconf[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi ; then - dosym msgfmt /usr/bin/gmsgfmt #43435 - dobin gettext-tools/misc/gettextize - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name "*.la" -delete || die - - if use java ; then - java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar - rm "${ED}"/usr/share/${PN}/*.jar || die - rm "${ED}"/usr/share/${PN}/*.class || die - if use doc ; then - java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/html/javadoc2 - fi - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - - if use doc ; then - docinto html - dodoc "${ED}"/usr/share/doc/${PF}/*.html - else - rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} - fi - rm "${ED}"/usr/share/doc/${PF}/*.html || die -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst -} diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest index ac4271e9accc..1deac46e3fea 100644 --- a/sys-devel/kgcc64/Manifest +++ b/sys-devel/kgcc64/Manifest @@ -1,17 +1,8 @@ AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 BLAKE2B 945e234afcbbf2b5d737d7a4b9fb9282070ece739e1e487723baf9aa4e7c0777ec7b43cdd4957c89b9fc42c15eb2aff0564b370dd6b3e1a3849bf32680c69bd1 SHA512 84d0ab9bcfdd18148392a7219ec0ad4a1e63d43bda3f45a13e22f551f2f119822fed700570bd659f9260b09b0958d4c49e339ad4f135740e5b60e46462de7f20 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff -DIST gcc-10.1.0-patches-1.tar.bz2 13432 BLAKE2B 2f0517778eb012288ae305a91f84eb31a5f08f842c504201f1a8085afd42ed4c9b4a5b15f7553982c926735e8ea57307a1749004e679880ef47abad7d4596115 SHA512 cc513d8b68dcf484d37c51961c809fc6c470a8341f068b4029430ca4677e7b49155c3d964b3b9ab50c69835b32db98bcb9a91f14de14417e4611521059192118 -DIST gcc-10.1.0.tar.xz 74591240 BLAKE2B d64cf01beaaff7af9e7d5b1d5e6fdfb37cce5667b4455c1c9bbfd190e631f03555d63d52d31e7be5ac232256be11058f89d5bc7d0dcb01de44e90a52645ad87f SHA512 0cb2a74c793face751f42bc580960b00e2bfea785872a0a2155f1f1dbfaa248f9591b67f4322db0f096f8844aca9243bc02732bda106c3b6e43b02bb67eb3096 DIST gcc-10.2.0-patches-1.tar.bz2 14865 BLAKE2B 055ceac96a308081f395f12a970d6f5264d5dfac6defabb6baefafd6d584c03f2f968e0720448af5b6955e209c5d2220bc45854088347d7b438de9d716072804 SHA512 3583f51b2b80e1dab5ebda174c83054375a0c6601c6fca54a6991bbbbe5f335e30ee846fae57c0096ce28b23715fbfee8b560727c77cac263e83f44f03c6eda4 DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e -DIST gcc-4.9.4-patches-1.0.tar.bz2 22266 BLAKE2B 38536e8a86a8296754311633b73da0bd7dddb3a6ac65e4b5ba1dde352789e9114a1129aad11bcb988a1baadec6fdf893290c6af83bb9fad5613f35a37ebbb12e SHA512 cc2407221f858bad38b57d31f635314f91794293695e23d255685d8bec20b9db19c7dc76bbf5e8184c2ba0ccb530958b09bae4d8a402ca27cadf463f46bfb995 -DIST gcc-4.9.4-patches-2.tar.bz2 27713 BLAKE2B daff50fcad1e06fdd04770d4be0c06f2c4a2abdcf28e3b7704fe5a41b6c02dedd33ea36db68b7f28fcdfc391f4731f85907ffa6d88bc98fb912db3749216e68b SHA512 e4cdbbb47ecf3107dc87889790020aef629a0b2070145df2cf23327c5343cb2ce5fe72f0d4661f19ba2a73ab1315a48d6f7a006d6d425f8de41db88308398937 -DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe -DIST gcc-5.4.0-patches-1.0.tar.bz2 28227 BLAKE2B 6a8a154259664b47c8b18b55e6f5180ca27396ffd3267b34406296dbad4fa966c945eb445a3013b972ce4468fdf1be14568bb20db89b4a0aa861a35404dbceea SHA512 70cd83b142abaa3c22d67d5d58185da2cfa178737ec963e230cc03ea8dc6dc757665c711fae91af4cd91062d3136c6f31a5ee3c4c7440ed9485c6f3632731940 -DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b -DIST gcc-5.5.0-patches-3.tar.bz2 31519 BLAKE2B 7ca1850e127210c8f594b0061adf578b9a94c69353a4a6e40722f7716ccaaa2979c0190171fbd84a756cbc1015d931afbf54a05c13ca7061105b626018b02506 SHA512 a3cbcf56c9655cb0f464da703277401046f309d4b06198dea18d3a8b67aafae30ecbfd01c74f2db375ce0801e75cb7be6016f96a0b61496e503e2fe22542c057 -DIST gcc-5.5.0.tar.xz 71096120 BLAKE2B 1e29ed718c8eb96facc405248b69406d77e27118473550ebd67cb1d62c627d3a394aeffca904e94a1a4c9edf7d0ba5fcd2a81e4b008790c64c1ba43dbed58781 SHA512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1 DIST gcc-6.4.0-patches-1.0.tar.bz2 7577 BLAKE2B 56f7f9722ba446d44753504616b877b522c7497be4cae87a6a090b8cd77aabf47a79e74640f6df9aea9a5fa981016627601e780c5632d6d5e09a1bd2ae163384 SHA512 e649e334eec4deb7c261d808ed460413d78a2a4a672823d214c1e173a13bc314ce898fbf3674a7c7fe3151a089384ee0a7dee479bc8d005a06b65b39216bdf75 DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90 DIST gcc-6.5.0-patches-5.tar.bz2 13723 BLAKE2B db0170d6db74dcb6dc3ec937379c188814cfe88b5204aa0c1cc925083d8f178be4896e98ff44fe224060e4e1fea98ef3c90aa8339b2cf78d33cd2dc8b94e3bdc SHA512 d79cf975157c5285faa893da0259b0013df66b01ad597322f05ece0343dd7912d8d793663448c04f37be93092e2fde06f84374e142cb81b12ba5964b37b0de89 @@ -27,12 +18,7 @@ DIST gcc-8.4.0.tar.xz 63713440 BLAKE2B e536b7d1da5942a522f4ccce489882dcd5aefb1c7 DIST gcc-9.3.0-patches-2.tar.bz2 13230 BLAKE2B d37859c753864be2c4b8c98847f6e51d9c2b1c091304971c31cf680d6f2194131bac3dfd625077117ca452d6f4416e72c7892d19ccc5880eac7a6bcbe5b2a286 SHA512 c5f7c9d4350879e5ca61e97897e37e4cfea56d0c961aad8df09041e6b1fededad0d7ed89387836d0779b947bdfe7696009d5c61c73630c45f09ca1f3ec3b163c DIST gcc-9.3.0-patches-3.tar.bz2 14193 BLAKE2B 4863fec1af41a8cdb2c24479b28812df36c1f71ab71d267ff0efc467cfb8ce99ed77714ceaedfb08b0d1eb0eb9316758cc7cbc5a8ad0bb582050690935e64b46 SHA512 8b90a5826df64e6f74e4f6c0e5acead695b38f671e26485b110d5b341daaad4ac21aabb04baae9ad457408eed274888b7f785bbc782611acfc7261e6a315d110 DIST gcc-9.3.0.tar.xz 70533868 BLAKE2B 21efb1432aefad5ed9b9b395e88ef2adfda3a8ea6e3e808cd151da6e66df9fed1bafdc8b8ff055d4b2272ac786d8b7ddc4293bb6b51c55c40a261a0eda0e7cb4 SHA512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de -EBUILD kgcc64-10.1.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0 EBUILD kgcc64-10.2.0.ebuild 984 BLAKE2B 9ba2b63821afa1a5ad81c5da4061359ddb7c849ade370c3cbef946a85b5272eae334edf9105281c40371991c4f1fa919ee52a46c62db7b7cc66f63f6e79b0581 SHA512 563c435487a64a6b396852bcf6525f4efe170313d3c1c94adf040035e6c400fa2c63025040673201f914a874f1e4f214f9487edb55cbdd34691a9875a47fb3b0 -EBUILD kgcc64-4.9.4-r1.ebuild 992 BLAKE2B dfe61ccae8cdd17c841ebe7bbb6fec51725d75f60533f6135c28dbf873b7986985eeb412021319cf475ce3e8f776d152c57e233fae67c7561fac177c4e3d7359 SHA512 b3272023a529991488d6a8e5b950c547a6b0137d56faffbfa330e2cd1167360ccc42da38d6cd9c3b77f63f6ceac4f176701f0fbcb87774155954ad9d982a09d9 -EBUILD kgcc64-4.9.4.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b -EBUILD kgcc64-5.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b -EBUILD kgcc64-5.5.0.ebuild 985 BLAKE2B 248c8e93ca6bf689b9047c13a2c169b9568da5debedef850acdf88440e9450c6f0ff9d095b2b3e124f730e545add1241972ecbd639464e3cf2525ff533cbd75c SHA512 62ff3f36be9beee2d754ff193574ecd7382a94ccd1a6584d8473e447e89b7229c3e1581cf74d89e836c9d1495ae10c8581dd86ab35b08409d7afd29b685e22cd EBUILD kgcc64-6.4.0.ebuild 1158 BLAKE2B a292e243d62c26664bbf77651d9169b02dfd088096c947f09de5156d05293e48c176ac9852125158a417540164f4e3dcfa77707039dcb2c047977038d925c290 SHA512 9c76b619fdfac0abf26b30de10743adc5bbfa1aa6ddfd62a208ba9a065388a7ac3976b6081ec7ae2692abfd2625ed1a65e0b7079e2a5c873f00da9800f2e928b EBUILD kgcc64-6.5.0.ebuild 985 BLAKE2B 74fbf80028f7ea7714f35dbd97993a301d70abbb648c6ee53f538f37000c451337a6fad5cd30f8cd5acab754293bded4f80d56e2a0f59bdb0e25a892c4e6f3fa SHA512 c33f877683b43fa8120001eb77265a841a6079842a3f069c933346e582ed1d66bc2220da3449bb459d32a5ce191634b0879cc580ab47cee3eeabcf90b81f566d EBUILD kgcc64-7.3.0.ebuild 1157 BLAKE2B 65104f756288207e86c110dfbfd1c617ec26cebb6c025ade86d0c61f3071c700e137aa0fc06d86484e463c9b592ec7ccf020dc4ea6959ecd67c03ce9d3954332 SHA512 29249a057bc9614939c43109c73aa0f91c479d0cb815ab6119d9c6a29471f82b97e9a0a4ac05d91c76dd1781ddc72fb8d3a3f8aaeb42d2768dcb2aac706733c1 diff --git a/sys-devel/kgcc64/kgcc64-10.1.0.ebuild b/sys-devel/kgcc64/kgcc64-10.1.0.ebuild deleted file mode 100644 index e0c1432958e8..000000000000 --- a/sys-devel/kgcc64/kgcc64-10.1.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -case ${CHOST} in - hppa*) CTARGET=hppa64-${CHOST#*-};; - mips*) CTARGET=${CHOST/mips/mips64};; - powerpc*) CTARGET=${CHOST/powerpc/powerpc64};; - s390*) CTARGET=${CHOST/s390/s390x};; - sparc*) CTARGET=${CHOST/sparc/sparc64};; - i?86*) CTARGET=x86_64-${CHOST#*-};; -esac -export CTARGET -TOOLCHAIN_ALLOWED_LANGS="c" -GCC_TARGET_NO_MULTILIB=true - -PATCH_VER="1" -inherit toolchain - -DESCRIPTION="64bit kernel compiler" - -# Works on hppa and mips; all other archs, refer to bug #228115 -KEYWORDS="~hppa ~mips" - -# unlike every other target, hppa has not unified the 32/64 bit -# ports in binutils yet -DEPEND="hppa? ( sys-devel/binutils-hppa64 )" - -pkg_postinst() { - toolchain_pkg_postinst - - cd "${ROOT}"/usr/bin - local x - for x in gcc cpp ; do - cat <<-EOF >${CTARGET%%-*}-linux-${x} - #!/bin/sh - exec ${CTARGET}-${x} "\$@" - EOF - chmod a+rx ${CTARGET%%-*}-linux-${x} - done -} diff --git a/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild b/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild deleted file mode 100644 index 6e9d9cc4f374..000000000000 --- a/sys-devel/kgcc64/kgcc64-4.9.4-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -case ${CHOST} in - hppa*) CTARGET=hppa64-${CHOST#*-};; - mips*) CTARGET=${CHOST/mips/mips64};; - powerpc*) CTARGET=${CHOST/powerpc/powerpc64};; - s390*) CTARGET=${CHOST/s390/s390x};; - sparc*) CTARGET=${CHOST/sparc/sparc64};; - i?86*) CTARGET=x86_64-${CHOST#*-};; -esac -export CTARGET -TOOLCHAIN_ALLOWED_LANGS="c" -GCC_TARGET_NO_MULTILIB=true - -PATCH_VER="2" - -inherit eutils toolchain - -DESCRIPTION="64bit kernel compiler" - -# Works on hppa and mips; all other archs, refer to bug #228115 -KEYWORDS="~hppa ~mips" - -# unlike every other target, hppa has not unified the 32/64 bit -# ports in binutils yet -DEPEND="hppa? ( sys-devel/binutils-hppa64 )" - -pkg_postinst() { - toolchain_pkg_postinst - - cd "${ROOT}"/usr/bin - local x - for x in gcc cpp ; do - cat <<-EOF >${CTARGET%%-*}-linux-${x} - #!/bin/sh - exec ${CTARGET}-${x} "\$@" - EOF - chmod a+rx ${CTARGET%%-*}-linux-${x} - done -} diff --git a/sys-devel/kgcc64/kgcc64-4.9.4.ebuild b/sys-devel/kgcc64/kgcc64-4.9.4.ebuild deleted file mode 100644 index 4763f516019f..000000000000 --- a/sys-devel/kgcc64/kgcc64-4.9.4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -case ${CHOST} in - hppa*) CTARGET=hppa64-${CHOST#*-};; - mips*) CTARGET=${CHOST/mips/mips64};; - powerpc*) CTARGET=${CHOST/powerpc/powerpc64};; - s390*) CTARGET=${CHOST/s390/s390x};; - sparc*) CTARGET=${CHOST/sparc/sparc64};; - i?86*) CTARGET=x86_64-${CHOST#*-};; -esac -export CTARGET -TOOLCHAIN_ALLOWED_LANGS="c" -GCC_TARGET_NO_MULTILIB=true - -PATCH_VER="1.0" - -inherit eutils toolchain - -DESCRIPTION="64bit kernel compiler" - -# Works on hppa and mips; all other archs, refer to bug #228115 -KEYWORDS="hppa ~mips" - -RDEPEND=">=dev-libs/gmp-4.3.2 - >=dev-libs/mpfr-2.4.2 - >=dev-libs/mpc-0.8.1 - >=sys-devel/gcc-config-1.4" -# unlike every other target, hppa has not unified the 32/64 bit -# ports in binutils yet -DEPEND="${RDEPEND} - hppa? ( sys-devel/binutils-hppa64 ) - >=sys-apps/texinfo-4.8 - >=sys-devel/bison-1.875" - -pkg_postinst() { - toolchain_pkg_postinst - - cd "${ROOT}"/usr/bin - local x - for x in gcc cpp ; do - cat <<-EOF >${CTARGET%%-*}-linux-${x} - #!/bin/sh - exec ${CTARGET}-${x} "\$@" - EOF - chmod a+rx ${CTARGET%%-*}-linux-${x} - done -} diff --git a/sys-devel/kgcc64/kgcc64-5.4.0.ebuild b/sys-devel/kgcc64/kgcc64-5.4.0.ebuild deleted file mode 100644 index 4763f516019f..000000000000 --- a/sys-devel/kgcc64/kgcc64-5.4.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -case ${CHOST} in - hppa*) CTARGET=hppa64-${CHOST#*-};; - mips*) CTARGET=${CHOST/mips/mips64};; - powerpc*) CTARGET=${CHOST/powerpc/powerpc64};; - s390*) CTARGET=${CHOST/s390/s390x};; - sparc*) CTARGET=${CHOST/sparc/sparc64};; - i?86*) CTARGET=x86_64-${CHOST#*-};; -esac -export CTARGET -TOOLCHAIN_ALLOWED_LANGS="c" -GCC_TARGET_NO_MULTILIB=true - -PATCH_VER="1.0" - -inherit eutils toolchain - -DESCRIPTION="64bit kernel compiler" - -# Works on hppa and mips; all other archs, refer to bug #228115 -KEYWORDS="hppa ~mips" - -RDEPEND=">=dev-libs/gmp-4.3.2 - >=dev-libs/mpfr-2.4.2 - >=dev-libs/mpc-0.8.1 - >=sys-devel/gcc-config-1.4" -# unlike every other target, hppa has not unified the 32/64 bit -# ports in binutils yet -DEPEND="${RDEPEND} - hppa? ( sys-devel/binutils-hppa64 ) - >=sys-apps/texinfo-4.8 - >=sys-devel/bison-1.875" - -pkg_postinst() { - toolchain_pkg_postinst - - cd "${ROOT}"/usr/bin - local x - for x in gcc cpp ; do - cat <<-EOF >${CTARGET%%-*}-linux-${x} - #!/bin/sh - exec ${CTARGET}-${x} "\$@" - EOF - chmod a+rx ${CTARGET%%-*}-linux-${x} - done -} diff --git a/sys-devel/kgcc64/kgcc64-5.5.0.ebuild b/sys-devel/kgcc64/kgcc64-5.5.0.ebuild deleted file mode 100644 index 6af7c6b045ab..000000000000 --- a/sys-devel/kgcc64/kgcc64-5.5.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -case ${CHOST} in - hppa*) CTARGET=hppa64-${CHOST#*-};; - mips*) CTARGET=${CHOST/mips/mips64};; - powerpc*) CTARGET=${CHOST/powerpc/powerpc64};; - s390*) CTARGET=${CHOST/s390/s390x};; - sparc*) CTARGET=${CHOST/sparc/sparc64};; - i?86*) CTARGET=x86_64-${CHOST#*-};; -esac -export CTARGET -TOOLCHAIN_ALLOWED_LANGS="c" -GCC_TARGET_NO_MULTILIB=true - -PATCH_VER="3" - -inherit toolchain - -DESCRIPTION="64bit kernel compiler" - -# Works on hppa and mips; all other archs, refer to bug #228115 -KEYWORDS="~hppa ~mips" - -# unlike every other target, hppa has not unified the 32/64 bit -# ports in binutils yet -DEPEND="hppa? ( sys-devel/binutils-hppa64 )" - -pkg_postinst() { - toolchain_pkg_postinst - - cd "${ROOT}"/usr/bin - local x - for x in gcc cpp ; do - cat <<-EOF >${CTARGET%%-*}-linux-${x} - #!/bin/sh - exec ${CTARGET}-${x} "\$@" - EOF - chmod a+rx ${CTARGET%%-*}-linux-${x} - done -} diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest index b828ae715bbf..2c38266738d4 100644 --- a/sys-devel/lld/Manifest +++ b/sys-devel/lld/Manifest @@ -1,13 +1,11 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 -DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f -DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD lld-10.0.0.ebuild 1478 BLAKE2B b91fbc24f88a6365b543ef20b6e80398545e921bf0ea8431a3b450a77cf1fa637506513d43d023b25a665a2a9324582e78adbce0df709f237b4e8a542181fa02 SHA512 8b45bf02033c78110eef573a2d7018972527637352bf097166f7a8fe6966fea9cf934e22f7aee62a9390e859d28fadca1c74dd0bc87874d0d5a3d6a720caef82 -EBUILD lld-10.0.1.ebuild 1329 BLAKE2B 24ef8612fe55b962e16117b59c8bffb9b587b0608579c3b0a930b3d3ae1457377ebb22fbd50b979c6dda436dcbdad57f6fcea7bdad209d6afbf02c80a02e70a6 SHA512 6352bb20b21e2234fbf5d3089b9318333b4c7ca0b5724cc3740d09720acffb56b628df18bc9a7178c7989c9085440ee5150f0bf87a620d67d3f69c2d9c6e41a6 -EBUILD lld-11.0.0.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31 -EBUILD lld-11.0.0_rc3.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31 -EBUILD lld-11.0.0_rc4.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31 -EBUILD lld-12.0.0.9999.ebuild 1712 BLAKE2B 3474cccbcab21eb1f7f0b5853465c8867c05ce9f0251a8e0f3b91f49c4491e2609f1d4a68e262dacae04d6d1786e0144a1a4a0864756b4183c5e39a55dfb5447 SHA512 5ce94b6b59396739cc0d4e6c7ffccc0ae23d9586b683705603f255accb5d1d1114c3082113853fe5c84a8692a46af42d208b70810b38a638243e113882646e68 +EBUILD lld-10.0.1.ebuild 1327 BLAKE2B 1c55c1e99e5e8bedbc1e3ab1b8159ee04e9128f7ddecc2fcb1800e12c62c1543cf16f9fc016eada3773c263f7a86c5199ead1f75d28db9126c6df3de6a9f0fba SHA512 9d22766d1b5915fade4ed73e1a5ba1eeb276d1cca640ba13d76502cf58025e03a96c4c162bbdfa328a29bc612d954771249300fe4724614b910b97f5313693c3 +EBUILD lld-11.0.0.9999.ebuild 1364 BLAKE2B 8d5960b7882b7fe2cfcf00c2dbfd15b04ae9e65757ee0704fa98b96d56a7e80550a953e18650a5ae8ab9c644e18690a8190e078672e328af3426b1d2b0131ee7 SHA512 2323c716189ae9741c83afb4ae3c20cdb23efc3538fcf968581b6f40a0612cd64bb1d324ac20548e27e133e633e990f51647f3d8dc4252208bcd5d69bf0aa59a +EBUILD lld-11.0.0.ebuild 1389 BLAKE2B 6d821d200a2a8bfc09eb71b53831d9bacac2477ea1ed25616182ffca37aaaf442ea7eb229fa6c0b31c365835da949640dc17a90de57e4d544f8380eb2d17a53c SHA512 4845a128ceef970d88d92702f0e5700680a5771507dbe7be6b9e97777d86944e3319627a36ede21cc5cc582eec9ba6ad4a5d0824c723f8bd7e057adac4397ac3 +EBUILD lld-12.0.0.9999.ebuild 1774 BLAKE2B 46a267286e87eef2c29faeb4ecfde5434a57d14c9d82c4f92f493fd238941ff9cf40927f21127eea95880f8562bdb411266d493e001a4534026a56fee76f5049 SHA512 5b61895d202eb2e8752b8ea1e713166ef452539bc7895703f82fa2b1f1135dd12aee7094515b5aceb6c3e6d78738af57521d9f33f5de874771f33ac6c2e7c14c EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/sys-devel/lld/lld-10.0.1.ebuild b/sys-devel/lld/lld-10.0.1.ebuild index d0fb4d618576..39abe87632eb 100644 --- a/sys-devel/lld/lld-10.0.1.ebuild +++ b/sys-devel/lld/lld-10.0.1.ebuild @@ -14,7 +14,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild index 7b627c88cf1b..05be08d3d096 100644 --- a/sys-devel/lld/lld-11.0.0.9999.ebuild +++ b/sys-devel/lld/lld-11.0.0.9999.ebuild @@ -20,7 +20,10 @@ RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" +BDEPEND="test? ( + >=dev-util/cmake-3.16 + $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") + )" python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" @@ -42,6 +45,7 @@ src_configure() { -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" + -DPython3_EXECUTABLE="${PYTHON}" ) cmake_src_configure diff --git a/sys-devel/lld/lld-11.0.0_rc3.ebuild b/sys-devel/lld/lld-11.0.0.ebuild index 7b627c88cf1b..7f446904215e 100644 --- a/sys-devel/lld/lld-11.0.0_rc3.ebuild +++ b/sys-devel/lld/lld-11.0.0.ebuild @@ -14,13 +14,16 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" +BDEPEND="test? ( + >=dev-util/cmake-3.16 + $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") + )" python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" @@ -42,6 +45,7 @@ src_configure() { -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" + -DPython3_EXECUTABLE="${PYTHON}" ) cmake_src_configure diff --git a/sys-devel/lld/lld-11.0.0_rc4.ebuild b/sys-devel/lld/lld-11.0.0_rc4.ebuild deleted file mode 100644 index 7b627c88cf1b..000000000000 --- a/sys-devel/lld/lld-11.0.0_rc4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org python-any-r1 - -DESCRIPTION="The LLVM linker (link editor)" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( lld ) -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="~sys-devel/llvm-${PV}" -DEPEND="${RDEPEND}" -BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" - -python_check_deps() { - has_version -b "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup - use test && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - - -DLLVM_INCLUDE_TESTS=$(usex test) - ) - use test && mycmakeargs+=( - -DLLVM_BUILD_TESTS=ON - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - cmake_src_configure -} - -src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-lld -} - -src_install() { - cmake_src_install - # LLD has no shared libraries, so strip it all for the time being - rm -r "${ED}"/usr/{include,lib*} || die -} diff --git a/sys-devel/lld/lld-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild index 88c1fe13f11f..61159e289d5a 100644 --- a/sys-devel/lld/lld-12.0.0.9999.ebuild +++ b/sys-devel/lld/lld-12.0.0.9999.ebuild @@ -20,7 +20,10 @@ RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" +BDEPEND="test? ( + >=dev-util/cmake-3.16 + $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") + )" python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" @@ -53,6 +56,7 @@ src_configure() { -DLLVM_BUILD_TESTS=ON -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="$(get_lit_flags)" + -DPython3_EXECUTABLE="${PYTHON}" ) cmake_src_configure diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest index d9406608b6cb..6be596812639 100644 --- a/sys-devel/llvm-common/Manifest +++ b/sys-devel/llvm-common/Manifest @@ -1,13 +1,11 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 -DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f -DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD llvm-common-10.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f -EBUILD llvm-common-10.0.1.ebuild 601 BLAKE2B 5d30bfa020f57e7b73406d6a5b297c295560543a051e40896df1ccdc620c186046e67f0613a7239e1d183a1ae6cc2e724e0177e15f5d75e9f966d3545d4d6df1 SHA512 3398aa2abe0eec569cd5b7985dc0666a120ebd8271bed27b8e039418208dc65603de0b2248ac7783f479905aeb50880f44ebc633626e69e8350cff61c79865a7 +EBUILD llvm-common-10.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f EBUILD llvm-common-11.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9 -EBUILD llvm-common-11.0.0_rc3.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9 -EBUILD llvm-common-11.0.0_rc4.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9 +EBUILD llvm-common-11.0.0.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f EBUILD llvm-common-12.0.0.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9 EBUILD llvm-common-9.0.1.ebuild 599 BLAKE2B d6ac1c054ea708da18d5f557f2be5f0adc7dc5172ea679421516792a2a5e8a9e734bcbbb8c890c0b6ac136d7976fc7bedfde8c42837e67536d5dfeec1cf56230 SHA512 0beeb50ce3280418dfbeea22322dc9c585024a66b39ff8ce2b1465e62ea66af75bb0a151ca431a1a794ad25d74afc1e2b1ac3b9529a283b4b36ebdc99991a29f MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild index 94516c09c44b..d12935e080d2 100644 --- a/sys-devel/llvm-common/llvm-common-10.0.1.ebuild +++ b/sys-devel/llvm-common/llvm-common-10.0.1.ebuild @@ -12,7 +12,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" RDEPEND="!sys-devel/llvm:0" diff --git a/sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild index df9cf92b47a1..d12935e080d2 100644 --- a/sys-devel/llvm-common/llvm-common-11.0.0_rc4.ebuild +++ b/sys-devel/llvm-common/llvm-common-11.0.0.ebuild @@ -12,7 +12,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" RDEPEND="!sys-devel/llvm:0" diff --git a/sys-devel/llvm-common/llvm-common-11.0.0_rc3.ebuild b/sys-devel/llvm-common/llvm-common-11.0.0_rc3.ebuild deleted file mode 100644 index df9cf92b47a1..000000000000 --- a/sys-devel/llvm-common/llvm-common-11.0.0_rc3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit llvm.org - -DESCRIPTION="Common files shared between multiple slots of LLVM" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( llvm/utils/vim ) -llvm.org_set_globals - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND="!sys-devel/llvm:0" - -src_install() { - insinto /usr/share/vim/vimfiles - doins -r */ - # some users may find it useful - newdoc README README.vim - dodoc vimrc -} diff --git a/sys-devel/llvm-roc/Manifest b/sys-devel/llvm-roc/Manifest index be8dc74ef1a4..08544a214ddc 100644 --- a/sys-devel/llvm-roc/Manifest +++ b/sys-devel/llvm-roc/Manifest @@ -1,7 +1,10 @@ AUX llvm-roc-3.0.0-add_libraries.patch 648 BLAKE2B a201718b8afdc1ba18ae5d7e85a73fde7ca2bb163eecabab33d37c5815ac6ab8c4f8d960ab40f95ad6df95da626a439fbda1d20c25abb9558a37bcdf64a77e64 SHA512 7a1892c8781146830aa5bf69db20bbe7329634f469aeef0946232b15138b55d332491092ed00a4cf698033f19d8f279f4a5b34f13168d5b9ff7eba4a229e82a0 AUX llvm-roc-3.7.0-current_pos.patch 1292 BLAKE2B 8481497e3f9c46c142034ae4c5455f94e79d9c10cc806945af64252043d46c558a3ba08078239a673937705edfd21ba85f618d1d3a5bff652d45efe4e1e70877 SHA512 6cd41988e4eb654b7040c238bef8fc10d8f5922bac9c0ba112c5ba1b57c769472d0b9deaea6822f2d6bbbfda0a27bed2c1df2bba93a79cb4bf08f24185843981 +AUX llvm-roc-3.9.0-tensorflow.patch 1901 BLAKE2B 2fc2d2d77987e8a85c14e1190645f0453f431a6d606336696549e518cf216a15818bc4117bec7c270161ef86f0e6770c63c9fda84e12f3c3334c9dd04fa5ffbf SHA512 151b2f0fc9fd7193fc0af0c088d70b2e36fda484228f3c911dbf1a6c6e836107a8e156a98585dd2ffb6faea0953a05d769e986d72def0f2f530bc3da5c5521d7 DIST llvm-rocm-ocl-3.7.0.tar.gz 116973132 BLAKE2B c1cc8a3b95292d726626d3cb59ec1b96549682bfcbec16030e47cf1318c6ea01bc76f3349f012ce4f1e4d8b9fe192c51a025c2d08cf593622c61fe7c61969ba6 SHA512 0626075bedb3898c96c0bb0be7a2aba4662050a1c738115f661bedc03d744ace7a4581b55c6325060740c13a0e50e72e09272bb02c1186c2c4a40fc9b961dcbe DIST llvm-rocm-ocl-3.8.0.tar.gz 117004300 BLAKE2B 13c3213f0fb951fb9d574e8f6d76bb6c632fecadfe93dbe68a9720baa22e35aa3269deef8b533c5a5ff50a2c1ee3dd7a1ea0fae4b8ab8573ec5bfc5ca5d04f4f SHA512 4eca387a132c9d1237ebec7c80319e99c80088766209d05a697d09890f4a82c56ba5f48a5c8c8749bb051c177bb5eab67e00405b04d3191681d0ac7cf1ae868c +DIST llvm-rocm-ocl-3.9.0.tar.gz 123591368 BLAKE2B 54b44d705e7704921df1914bac6dc1da8e420f9383efb698a9cf6a339b653d71cad29aa077a9e24d6764ca81fb8dc55fa70abb0cfac004d40f7d811e20ec9945 SHA512 3404390506b33c1de1d05980fafb219692985f38b52d852e9a47ab94e57228caa25ccd0d0d69da656281de32c75e001f60cb9f22453e70fea7b39d065d4333af EBUILD llvm-roc-3.7.0-r1.ebuild 1397 BLAKE2B 08aec56b8ab26093f28a9118ca043adb35dcb84ae5899da5890cbeecb5d10f8d6b08e767a490272a5f35d1b3a5ee8d912a52b448ee57582cda9f99fce57ec8ec SHA512 745f2a9fa18bc3b9d76a324beb1e5165f9be8f720ef133b35e1509c08c08e48872ec4c7402e52d29a3b493e27729a43081fd0e90afe90d30b64d6da3f046e824 EBUILD llvm-roc-3.8.0.ebuild 1492 BLAKE2B 73fd9fd2c47a18b5de44222b84fead548f85b4e67c18838050c52917b6836debee77bc83db6aa0a378516b48a56e5daaac53dde84bdbe1dbefd02494b06498d8 SHA512 d45f0e60c2f12e9b98425310fe370aeeb5d29cd24bfa83b1b908bcbc25866a49e6e1fc7facb04e699bd897f1960a394f2e3a4c5a8308ad9af6177f735dc40631 +EBUILD llvm-roc-3.9.0.ebuild 1529 BLAKE2B 07aac1728864214e61ed45cee3ca718c7830835502fe9e6c1e5ba5d6fc8303f3b644b0bb3476f8a1adcaabf09e961b3b55bfce34312b953e8ba855b7f36cdecb SHA512 5b9755c9c06ed465b58d8ca7c677211c04cb05eafaffee1e558b26d3d3bc033a1b8d6b1b3e69732441edd9f14cbf608da919f4eac3e283f5f4226dc332ffb68c MISC metadata.xml 461 BLAKE2B 5a060c417f0bb9bf1fba8375292e7bff20b2c50c3a2ab490bd436f81a954dbd370d61ba59b305b8bdaad9887e9c6a872eb30fea31c566dc6d74d3493b40d0a26 SHA512 a82c2186fc0642dab37608155dcf0aafd20701cb7e2769c6eb3aae88d4df6690743769a75f47efdb36fd8a3d6771f0feecd3efd01c98460fe195394c16d95660 diff --git a/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch b/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch new file mode 100644 index 000000000000..3e1124457ad3 --- /dev/null +++ b/sys-devel/llvm-roc/files/llvm-roc-3.9.0-tensorflow.patch @@ -0,0 +1,35 @@ +--- llvm-project-rocm-3.9.0.orig/CMakeLists.txt 2020-11-12 22:03:09.902293395 +0100 ++++ llvm-project-rocm-3.9.0/CMakeLists.txt 2020-11-12 22:07:28.185294853 +0100 +@@ -824,6 +824,11 @@ + ${LLVM_INCLUDE_DIR}/llvm/Config/Targets.def + ) + ++# They are not referenced. See set_output_directory(). ++set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) ++set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++ + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # In this case, the latest C API library is available for download from +@@ -832,18 +837,13 @@ + # LLVM_HAVE_TF_API, through llvm-config.h, so that a user of the LLVM library may + # also leverage the dependency. + set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install") +-find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib) + +-if (tensorflow_c_api) ++if (TENSORFLOW_C_LIB_PATH) ++ find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib NO_DEFAULT_PATH REQUIRED) + set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available") + include_directories(${TENSORFLOW_C_LIB_PATH}/include) + endif() + +-# They are not referenced. See set_output_directory(). +-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +-set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +-set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +- + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # Specifically, assuming python3 is installed: diff --git a/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild new file mode 100644 index 000000000000..bc0fdfcde777 --- /dev/null +++ b/sys-devel/llvm-roc/llvm-roc-3.9.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Radeon Open Compute llvm,lld,clang" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/" +SRC_URI="https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-${PV}.tar.gz -> llvm-rocm-ocl-${PV}.tar.gz" + +LICENSE="UoI-NCSA rc BSD public-domain" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug runtime" + +RDEPEND="virtual/cblas + dev-libs/libxml2 + sys-libs/zlib + sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +PDEPEND="dev-libs/rocr-runtime" + +S="${WORKDIR}/llvm-project-rocm-${PV}/llvm" + +PATCHES=( + "${FILESDIR}/${PN}-3.7.0-current_pos.patch" + "${FILESDIR}/${P}-tensorflow.patch" +) + +CMAKE_BUILD_TYPE=RelWithDebInfo + +src_prepare() { + cd "${WORKDIR}/llvm-project-rocm-${PV}" || die + eapply "${FILESDIR}/${PN}-3.0.0-add_libraries.patch" + eapply_user + cmake_src_prepare +} + +src_configure() { + PROJECTS="clang;lld" + + if usex runtime; then + PROJECTS+=";compiler-rt" + fi + + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/roc" + -DLLVM_ENABLE_PROJECTS="${PROJECTS}" + -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" + -DLLVM_BUILD_DOCS=NO + -DLLVM_ENABLE_OCAMLDOC=OFF + -DLLVM_ENABLE_SPHINX=NO + -DLLVM_ENABLE_DOXYGEN=OFF + -DLLVM_INSTALL_UTILS=ON + -DLLVM_VERSION_SUFFIX=roc + -DOCAMLFIND=NO + ) + + use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" + + cmake_src_configure +} + +src_install() { + cmake_src_install + cat > "99${PN}" <<-EOF + LDPATH="${EROOT}/usr/lib/llvm/roc/lib" + EOF + doenvd "99${PN}" +} diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 32282d709935..8fac45f0da44 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,19 +1,20 @@ AUX 10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch 1480 BLAKE2B 09057d1e7ad466ba316335b66d9acf7b55fabdb209bddf7d28e641ea7a922d8af51ad6a8f0ab41b28da7ff0e76148d5ea388ad447bcd828f11ad3e7d89d0f78d SHA512 366041f1c4a4d7c3af2b611f65b238cb0bd00806ad0afa1181f05900b512a84c8997b2f2843564a573478af2e7b225d6ccc7ffe7823d88acd2ede706bee49ffa AUX 10.0.1/0002-llvm-Disable-linking-llvm-exegesis-to-dylib.patch 983 BLAKE2B af7f06cf16ed45d446c7f879ccdc2d6ef50cd5e04f5eec40a2097f429063daeef610945e5201cb937349c041fc7d124df11319b253b4ea89f6b7baf701924ec9 SHA512 b39c0fc939d56cd6bb96b107d93cda23b01b76f51639000cf7b5516792c7bfcafbee56c0845b87cc30d172fa90f9fb2bdf137a5b27da272d405acec32bcc5b8d +AUX 11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch 2450 BLAKE2B b070b1b90e63eda30caceda63076f44e7d72c41567b28f56ccaebffbb7b832cac72c2d444007988f5e535173eb961ba23b56d6e50a8bcbe18dbcf751527cb876 SHA512 c10f7fff5f951ef17a77c25ec85072e06a1cd672720cf2a3a5c72102f0968ee2123bf02fdcd5df41b7832564891ace6dd58ce5370c42f6be5e52c72780f2abfa AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 1188 BLAKE2B 72311a8da991b9f3b98523baefe6f5b31aa7f9101c388f35484dd5f384a08e838ea42a17447ca17a0dfe6b7d3c20abbdf0e8afee72e8ad5d46ec38b8d55307c8 SHA512 0ada997db2a0eb875105fb212dc3fc3077b9c4f7804d78c33c4b1f512bf1267295f325153ae14c00404c86e576ae1c78a6aeb0a57d1d4525aabd1169c21806ef AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f DIST llvm-10.0.0-manpages.tar.bz2 177084 BLAKE2B 16b38e60fce4d67ac602b317ea7089c095d46b9426ba9940041e65d7ab493f85dba2e94a4aeba7b7c52042f23825efcfcd32a57d306aaf05b4307061a5a8a368 SHA512 eac57ad218ff4c2b5a74e453a29192ee6e911152b668d8a9420b59529d5cae8aa241f2485b4a7ea304acbecc7ecb27391a77552080726432c2b7b59b95fc0bd7 +DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc +DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 -DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f -DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1 +DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 EBUILD llvm-10.0.0.ebuild 10751 BLAKE2B 338970325836138a0214d3e97e1b408b466052abe7bda4815edcb41e3b998a7b9df26bcf2caf457ee8b66d997b383a0f94a196a580671db4b5288b8522e48bb5 SHA512 c588a1cce4e950bdbd189ad0f44c1b9377adc5bdf041a1da4872cc2d629d79f73132f1776cee09d8e08cd799aa7bc0473915d3a3644606e3cc26f5329b533194 -EBUILD llvm-10.0.1.ebuild 11705 BLAKE2B d0c82c5652f611446cc36756ef005fb970b7dfda8c2e6ef6e64818564f2918340f0243cf3b82ff91d1b7f6d1dfb926f5e3f057d81f0a25ea265e1629f0cc2398 SHA512 651e7135a571e7404d8db82d36a5904b957752d164be9c24ad8847ddb3589c4ad571edb96cd56c6e38ffb9dc61601dee47a766a39b3904f67f8706ac8e0a011d -EBUILD llvm-11.0.0.9999.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528 -EBUILD llvm-11.0.0_rc3.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528 -EBUILD llvm-11.0.0_rc4.ebuild 12325 BLAKE2B 41fe35b64d8f98a89f1a0ccab2861ad2d8ac4073ca944fa0f29d51246a9df5d06fd94ce2e68983e4936341c72c5d296b2af1dc8eb3414645f533afcb664653ed SHA512 d3e15dd002796b0f4b06daad6d33ed14f96b60eb45db74584c2b39878c0b064c5f185edf728d11e943b930f508f115cc3b88c05bc0da8274a42749bd8a88e528 -EBUILD llvm-12.0.0.9999.ebuild 12348 BLAKE2B 2a40e5ce5c5f930d7a50da3bae3fd3324ffdd4e9b0824e440d2f741fca13b4acb9094948961951d20a1ac14f2bbbff24fc92c693ab132eb10917d790d970b9c2 SHA512 f107d05eda19a34c4a0cf8204ce1fdba0683b9d096ed2f3ebde36c59bc666bc4e159d82782d5a12624fc193f49224cf51313312dd222a85c54977900a31f521d +EBUILD llvm-10.0.1.ebuild 11955 BLAKE2B df1609d90f64fe1ff969af18adf18aee99ef3ddc947ee7ebc1c247e0bedc38f39cc46498841bd3fb85378329ef05f5dfa32a522c6549313d27a7f177680ad1c4 SHA512 6385e8501f927a7015298d75e472949470c58b39e35ba8cf6d264662942b714235913c49b9c37f17ce9835c220b64dbea961716bf57b62ebcc8edbb9f46f6acc +EBUILD llvm-11.0.0.9999.ebuild 12629 BLAKE2B 2af00259c1df990169c614e689007cfea6cb877a9df06b64255c8fde48e9f750b1744918dae483730a40a0152edf99c2bbc72101a2920f19202e2d1f95fe9bc2 SHA512 5e086dda86d65e34ab9528ac2d04945a22aeb359a24c11e9b2a9d4f0862e10c879d2e1bc4e99cf3e650f1685d8c1ddf5a066fb167c880d005fc71670bb89641a +EBUILD llvm-11.0.0.ebuild 12904 BLAKE2B f3f6bb06293efb2ab541e17d3051266a551c665f525a41d29733c8977d823dfded4e11fcac963d3302013795539f9774376c5c0f784d5e1ebbf3748cac698e8a SHA512 776abfb031174677a2a6bc36c82af074c2c38c5387af578ca6cd716f8d8a4ad8478a4ffce096dcf0ca18b30cb8231a5df2db35e7b7139efb65e06cb108b1d1fe +EBUILD llvm-12.0.0.9999.ebuild 12718 BLAKE2B 496526527ec7cc5aea590e45a6d38800da60d446f54568a164465cc184e22e07653e745220d2271ef0d9cacdcad08404a5a5aee153086e6aa99e6022607b5087 SHA512 6091649ca4fc3864f5f3dfefc1fa5d74a539b314775d1da22c8505eafe22c40496b84919b0169de0c85e0fa2a954a98e46f09688c9d8855c3437a6ffd75e00d7 EBUILD llvm-9.0.1.ebuild 8454 BLAKE2B 33b4c7bdf4bc136d29f3f6f505799b11de31d33e393b51c9bafb121b0b8b347e86a5954ba6ba039cd6b39cb7c1a501d4747f51652351559c42ba0b84c4bae54b SHA512 f43a600265c1559e924a6f2ec97dffdacfae35df2cc3e3e874704c5ae179ba48d90fdd666411cdab500d171fa63b557538282545c7c4078867857e077c941a4c MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2 diff --git a/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch b/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch new file mode 100644 index 000000000000..73959afb2677 --- /dev/null +++ b/sys-devel/llvm/files/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch @@ -0,0 +1,55 @@ +From 8dcb88f7705fb3927938dd9bd103efcabafcefb0 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Tue, 27 Oct 2020 18:20:56 -0700 +Subject: [PATCH] backport D88371, guard `find_library(tensorflow_c_api ...)` + +Differential Revision: https://reviews.llvm.org/D88371 +Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> +--- + llvm/CMakeLists.txt | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index 1f137f0..4112def 100644 +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -832,6 +832,11 @@ configure_file( + ${LLVM_INCLUDE_DIR}/llvm/Config/Targets.def + ) + ++# They are not referenced. See set_output_directory(). ++set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) ++set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) ++ + # For up-to-date instructions for installing the Tensorflow dependency, refer to + # the bot setup script: https://github.com/google/ml-compiler-opt/blob/master/buildbot/buildbot_init.sh + # In this case, the latest C API library is available for download from +@@ -840,9 +845,9 @@ configure_file( + # LLVM_HAVE_TF_API, through llvm-config.h, so that a user of the LLVM library may + # also leverage the dependency. + set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install") +-find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib) + +-if (tensorflow_c_api) ++if (TENSORFLOW_C_LIB_PATH) ++ find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib NO_DEFAULT_PATH REQUIRED) + set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available") + include_directories(${TENSORFLOW_C_LIB_PATH}/include) + endif() +@@ -877,12 +882,6 @@ add_custom_target(srpm + COMMAND rpmbuild -bs --define '_topdir ${LLVM_SRPM_DIR}' ${LLVM_SRPM_BINARY_SPECFILE}) + set_target_properties(srpm PROPERTIES FOLDER "Misc") + +- +-# They are not referenced. See set_output_directory(). +-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/bin ) +-set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +-set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX} ) +- + if(APPLE AND DARWIN_LTO_LIBRARY) + set(CMAKE_EXE_LINKER_FLAGS + "${CMAKE_EXE_LINKER_FLAGS} -Wl,-lto_library -Wl,${DARWIN_LTO_LIBRARY}") +-- +2.26.2 + diff --git a/sys-devel/llvm/llvm-10.0.1.ebuild b/sys-devel/llvm/llvm-10.0.1.ebuild index dfd63e89cbab..d81126a219bc 100644 --- a/sys-devel/llvm/llvm-10.0.1.ebuild +++ b/sys-devel/llvm/llvm-10.0.1.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( llvm ) +LLVM_MANPAGES=pregenerated llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention @@ -28,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" SLOT="$(ver_cut 1)" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" @@ -58,11 +59,12 @@ BDEPEND=" <sys-libs/libcxx-$(ver_cut 1-3).9999 >=sys-devel/binutils-apple-5.1 ) - libffi? ( virtual/pkgconfig ) - $(python_gen_any_dep ' + doc? ( $(python_gen_any_dep ' + dev-python/recommonmark[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) - ')" + ') ) + libffi? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -77,10 +79,9 @@ PATCHES=( ) python_check_deps() { - if use doc; then - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || - return 1 - fi + use doc || return 0 + + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -111,7 +112,7 @@ check_distribution_components() { ;; # used only w/ USE=doc docs-llvm-html) - continue + use doc || continue ;; esac @@ -275,12 +276,16 @@ get_distribution_components() { # python modules opt-viewer - - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-dsymutil-man + docs-llvm-dwarfdump-man + docs-llvm-man + ) + fi use doc && out+=( docs-llvm-html ) @@ -362,15 +367,22 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON + -DLLVM_BUILD_DOCS=${build_docs} -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=ON + -DLLVM_ENABLE_SPHINX=${build_docs} -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF ) use gold && mycmakeargs+=( -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include @@ -465,6 +477,7 @@ multilib_src_install_all() { _EOF_ docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages } pkg_postinst() { diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild index 6ee898821d6b..8e4357a1098c 100644 --- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( llvm ) +LLVM_MANPAGES=build llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention @@ -53,16 +54,18 @@ DEPEND="${RDEPEND} gold? ( sys-libs/binutils-libs )" BDEPEND=" dev-lang/perl + >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 >=sys-devel/binutils-apple-5.1 ) - libffi? ( virtual/pkgconfig ) - $(python_gen_any_dep ' + doc? ( $(python_gen_any_dep ' + dev-python/recommonmark[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) - ')" + ') ) + libffi? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -71,10 +74,9 @@ PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" python_check_deps() { - if use doc; then - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || - return 1 - fi + use doc || return 0 + + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -137,7 +139,7 @@ check_distribution_components() { ;; # used only w/ USE=doc docs-llvm-html) - continue + use doc || continue ;; esac @@ -301,12 +303,16 @@ get_distribution_components() { # python modules opt-viewer - - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-dsymutil-man + docs-llvm-dwarfdump-man + docs-llvm-man + ) + fi use doc && out+=( docs-llvm-html ) @@ -362,6 +368,8 @@ multilib_src_configure() { # used only for llvm-objdump tool -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) + -DPython3_EXECUTABLE="${PYTHON}" + # disable OCaml bindings (now in dev-ml/llvm-ocaml) -DOCAMLFIND=NO ) @@ -388,15 +396,22 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON + -DLLVM_BUILD_DOCS=${build_docs} -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=ON + -DLLVM_ENABLE_SPHINX=${build_docs} -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF ) use gold && mycmakeargs+=( -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include @@ -491,6 +506,7 @@ multilib_src_install_all() { _EOF_ docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages } pkg_postinst() { diff --git a/sys-devel/llvm/llvm-11.0.0_rc3.ebuild b/sys-devel/llvm/llvm-11.0.0.ebuild index 6ee898821d6b..1b22698435e6 100644 --- a/sys-devel/llvm/llvm-11.0.0_rc3.ebuild +++ b/sys-devel/llvm/llvm-11.0.0.ebuild @@ -10,6 +10,7 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( llvm ) +LLVM_MANPAGES=pregenerated llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention @@ -28,7 +29,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" SLOT="$(ver_cut 1)" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin ${ALL_LLVM_TARGETS[*]}" REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" @@ -53,16 +54,18 @@ DEPEND="${RDEPEND} gold? ( sys-libs/binutils-libs )" BDEPEND=" dev-lang/perl + >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 >=sys-devel/binutils-apple-5.1 ) - libffi? ( virtual/pkgconfig ) - $(python_gen_any_dep ' + doc? ( $(python_gen_any_dep ' + dev-python/recommonmark[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) - ')" + ') ) + libffi? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -70,11 +73,16 @@ RDEPEND="${RDEPEND} PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" +PATCHES=( + # backport tensorflow finding fix (avoids broken automagic dep) + # https://bugs.gentoo.org/748444 + "${FILESDIR}"/11.0.0/0001-backport-D88371-guard-find_library-tensorflow_c_api.patch +) + python_check_deps() { - if use doc; then - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || - return 1 - fi + use doc || return 0 + + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -137,7 +145,7 @@ check_distribution_components() { ;; # used only w/ USE=doc docs-llvm-html) - continue + use doc || continue ;; esac @@ -301,12 +309,16 @@ get_distribution_components() { # python modules opt-viewer - - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-dsymutil-man + docs-llvm-dwarfdump-man + docs-llvm-man + ) + fi use doc && out+=( docs-llvm-html ) @@ -362,6 +374,8 @@ multilib_src_configure() { # used only for llvm-objdump tool -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) + -DPython3_EXECUTABLE="${PYTHON}" + # disable OCaml bindings (now in dev-ml/llvm-ocaml) -DOCAMLFIND=NO ) @@ -388,15 +402,22 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON + -DLLVM_BUILD_DOCS=${build_docs} -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=ON + -DLLVM_ENABLE_SPHINX=${build_docs} -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF ) use gold && mycmakeargs+=( -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include @@ -491,6 +512,7 @@ multilib_src_install_all() { _EOF_ docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages } pkg_postinst() { diff --git a/sys-devel/llvm/llvm-11.0.0_rc4.ebuild b/sys-devel/llvm/llvm-11.0.0_rc4.ebuild deleted file mode 100644 index 6ee898821d6b..000000000000 --- a/sys-devel/llvm/llvm-11.0.0_rc4.ebuild +++ /dev/null @@ -1,503 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ - toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="https://llvm.org/" -LLVM_COMPONENTS=( llvm ) -llvm.org_set_globals - -# Those are in lib/Targets, without explicit CMakeLists.txt mention -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) -# Keep in sync with CMakeLists.txt -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore - "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) - -# Additional licenses: -# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. -# 2. xxhash: BSD. -# 3. MD5 code: public-domain. -# 4. ConvertUTF.h: TODO. - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="$(ver_cut 1)" -KEYWORDS="" -IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 - kernel_Darwin ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:0=[${MULTILIB_USEDEP}] - exegesis? ( dev-libs/libpfm:= ) - gold? ( - || ( - >=sys-devel/binutils-2.31.1-r4:*[plugins] - <sys-devel/binutils-2.31.1-r4:*[cxx] - ) - ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - xar? ( app-arch/xar ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - gold? ( sys-libs/binutils-libs )" -BDEPEND=" - dev-lang/perl - sys-devel/gnuconfig - kernel_Darwin? ( - <sys-libs/libcxx-$(ver_cut 1-3).9999 - >=sys-devel/binutils-apple-5.1 - ) - libffi? ( virtual/pkgconfig ) - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) - ')" -# There are no file collisions between these versions but having :0 -# installed means llvm-config there will take precedence. -RDEPEND="${RDEPEND} - !sys-devel/llvm:0" -PDEPEND="sys-devel/llvm-common - gold? ( >=sys-devel/llvmgold-${SLOT} )" - -python_check_deps() { - if use doc; then - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || - return 1 - fi - has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -check_live_ebuild() { - local prod_targets=( - $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ - | tail -n +2 | head -n -1) - ) - local all_targets=( - lib/Target/*/ - ) - all_targets=( "${all_targets[@]#lib/Target/}" ) - all_targets=( "${all_targets[@]%/}" ) - - local exp_targets=() i - for i in "${all_targets[@]}"; do - has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) - done - # reorder - all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) - - if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then - eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}" - eqawarn "Expected: ${exp_targets[*]}" - eqawarn - fi - - if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then - eqawarn "ALL_LLVM_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" - eqawarn "Expected: ${all_targets[*]}" - fi -} - -check_distribution_components() { - if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then - local all_targets=() my_targets=() l - cd "${BUILD_DIR}" || die - - while read -r l; do - if [[ ${l} == install-*-stripped:* ]]; then - l=${l#install-} - l=${l%%-stripped*} - - case ${l} in - # shared libs - LLVM|LLVMgold) - ;; - # TableGen lib + deps - LLVMDemangle|LLVMSupport|LLVMTableGen) - ;; - # static libs - LLVM*) - continue - ;; - # meta-targets - distribution|llvm-libraries) - continue - ;; - # used only w/ USE=doc - docs-llvm-html) - continue - ;; - esac - - all_targets+=( "${l}" ) - fi - done < <(ninja -t targets all) - - while read -r l; do - my_targets+=( "${l}" ) - done < <(get_distribution_components $"\n") - - local add=() remove=() - for l in "${all_targets[@]}"; do - if ! has "${l}" "${my_targets[@]}"; then - add+=( "${l}" ) - fi - done - for l in "${my_targets[@]}"; do - if ! has "${l}" "${all_targets[@]}"; then - remove+=( "${l}" ) - fi - done - - if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then - eqawarn "get_distribution_components() is outdated!" - eqawarn " Add: ${add[*]}" - eqawarn "Remove: ${remove[*]}" - fi - cd - >/dev/null || die - fi -} - -src_prepare() { - # Fix llvm-config for shared linking and sane flags - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # Update config.guess to support more systems - cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die - - # Verify that the live ebuild is up-to-date - check_live_ebuild - - llvm.org_src_prepare -} - -# Is LLVM being linked against libc++? -is_libcxx_linked() { - local code='#include <ciso646> -#if defined(_LIBCPP_VERSION) - HAVE_LIBCXX -#endif -' - local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1 - - [[ ${out} == *HAVE_LIBCXX* ]] -} - -get_distribution_components() { - local sep=${1-;} - - local out=( - # shared libs - LLVM - LTO - Remarks - - # tools - llvm-config - - # common stuff - cmake-exports - llvm-headers - - # libraries needed for clang-tblgen - LLVMDemangle - LLVMSupport - LLVMTableGen - ) - - if multilib_is_native_abi; then - out+=( - # utilities - llvm-tblgen - FileCheck - llvm-PerfectShuffle - count - not - yaml-bench - - # tools - bugpoint - dsymutil - llc - lli - lli-child-target - llvm-addr2line - llvm-ar - llvm-as - llvm-bcanalyzer - llvm-c-test - llvm-cat - llvm-cfi-verify - llvm-config - llvm-cov - llvm-cvtres - llvm-cxxdump - llvm-cxxfilt - llvm-cxxmap - llvm-diff - llvm-dis - llvm-dlltool - llvm-dwarfdump - llvm-dwp - llvm-elfabi - llvm-exegesis - llvm-extract - llvm-gsymutil - llvm-ifs - llvm-install-name-tool - llvm-jitlink - llvm-lib - llvm-link - llvm-lipo - llvm-lto - llvm-lto2 - llvm-mc - llvm-mca - llvm-ml - llvm-modextract - llvm-mt - llvm-nm - llvm-objcopy - llvm-objdump - llvm-opt-report - llvm-pdbutil - llvm-profdata - llvm-ranlib - llvm-rc - llvm-readelf - llvm-readobj - llvm-reduce - llvm-rtdyld - llvm-size - llvm-split - llvm-stress - llvm-strings - llvm-strip - llvm-symbolizer - llvm-undname - llvm-xray - obj2yaml - opt - sancov - sanstats - verify-uselistorder - yaml2obj - - # python modules - opt-viewer - - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man - ) - use doc && out+=( - docs-llvm-html - ) - - use gold && out+=( - LLVMgold - ) - fi - - printf "%s${sep}" "${out[@]}" -} - -multilib_src_configure() { - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) - ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - # disable appending VCS revision to the version to improve - # direct cache hit ratio - -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=OFF - -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=ON - -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) - - # cheap hack: LLVM combines both anyway, and the only difference - # is that the former list is explicitly verified at cmake time - -DLLVM_TARGETS_TO_BUILD="" - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_LIBEDIT=$(usex libedit) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_LIBXML2=$(usex xml) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_LIBPFM=$(usex exegesis) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - -DLLVM_ENABLE_Z3_SOLVER=$(usex z3) - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - # used only for llvm-objdump tool - -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) - - # disable OCaml bindings (now in dev-ml/llvm-ocaml) - -DOCAMLFIND=NO - ) - - if is_libcxx_linked; then - # Smart hack: alter version suffix -> SOVERSION when linking - # against libc++. This way we won't end up mixing LLVM libc++ - # libraries with libstdc++ clang, and the other way around. - mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" - ) - fi - -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=ON - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_UTILS=ON - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - use gold && mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - - # workaround BMI bug in gcc-7 (fixed in 7.4) - # https://bugs.gentoo.org/649880 - # apply only to x86, https://bugs.gentoo.org/650506 - if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && - [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] - then - local CFLAGS="${CFLAGS} -mno-bmi" - local CXXFLAGS="${CXXFLAGS} -mno-bmi" - fi - - # LLVM can have very high memory consumption while linking, - # exhausting the limit on 32-bit linker executable - use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure - - multilib_is_native_abi && check_distribution_components -} - -multilib_src_compile() { - cmake_build distribution - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake_build check -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/llvm-config.h - ) - - local LLVM_LDPATHS=() - multilib-minimal_src_install - - # move wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-distribution - - # move headers to /usr/include for wrapping - rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die - - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) -} - -multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) - newenvd - "60llvm-${revord}" <<-_EOF_ - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" - _EOF_ - - docompress "/usr/lib/llvm/${SLOT}/share/man" -} - -pkg_postinst() { - elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" - elog "To use these scripts, you will need Python along with the following" - elog "packages:" - elog " dev-python/pygments (for opt-viewer)" - elog " dev-python/pyyaml (for all of them)" -} diff --git a/sys-devel/llvm/llvm-12.0.0.9999.ebuild b/sys-devel/llvm/llvm-12.0.0.9999.ebuild index 9f6248bfa037..a1a53f9e1e26 100644 --- a/sys-devel/llvm/llvm-12.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-12.0.0.9999.ebuild @@ -10,10 +10,11 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" LLVM_COMPONENTS=( llvm ) +LLVM_MANPAGES=build llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention -ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE ) +ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE ) # Keep in sync with CMakeLists.txt ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore @@ -53,16 +54,18 @@ DEPEND="${RDEPEND} gold? ( sys-libs/binutils-libs )" BDEPEND=" dev-lang/perl + >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 >=sys-devel/binutils-apple-5.1 ) - libffi? ( virtual/pkgconfig ) - $(python_gen_any_dep ' + doc? ( $(python_gen_any_dep ' + dev-python/recommonmark[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - doc? ( dev-python/recommonmark[${PYTHON_USEDEP}] ) - ')" + ') ) + libffi? ( virtual/pkgconfig ) + ${PYTHON_DEPS}" # There are no file collisions between these versions but having :0 # installed means llvm-config there will take precedence. RDEPEND="${RDEPEND} @@ -71,10 +74,9 @@ PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" python_check_deps() { - if use doc; then - has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || - return 1 - fi + use doc || return 0 + + has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } @@ -137,7 +139,7 @@ check_distribution_components() { ;; # used only w/ USE=doc docs-llvm-html) - continue + use doc || continue ;; esac @@ -241,6 +243,7 @@ get_distribution_components() { llvm-ar llvm-as llvm-bcanalyzer + llvm-bitcode-strip llvm-c-test llvm-cat llvm-cfi-verify @@ -262,6 +265,7 @@ get_distribution_components() { llvm-ifs llvm-install-name-tool llvm-jitlink + llvm-jitlink-executor llvm-lib llvm-libtool-darwin llvm-link @@ -297,17 +301,22 @@ get_distribution_components() { opt sancov sanstats + split-file verify-uselistorder yaml2obj # python modules opt-viewer - - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man ) + + if llvm_are_manpages_built; then + out+=( + # manpages + docs-dsymutil-man + docs-llvm-dwarfdump-man + docs-llvm-man + ) + fi use doc && out+=( docs-llvm-html ) @@ -363,6 +372,8 @@ multilib_src_configure() { # used only for llvm-objdump tool -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) + -DPython3_EXECUTABLE="${PYTHON}" + # disable OCaml bindings (now in dev-ml/llvm-ocaml) -DOCAMLFIND=NO ) @@ -389,15 +400,22 @@ multilib_src_configure() { ) if multilib_is_native_abi; then + local build_docs=OFF + if llvm_are_manpages_built; then + build_docs=ON + mycmakeargs+=( + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" + -DSPHINX_WARNINGS_AS_ERRORS=OFF + ) + fi + mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON + -DLLVM_BUILD_DOCS=${build_docs} -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=ON + -DLLVM_ENABLE_SPHINX=${build_docs} -DLLVM_ENABLE_DOXYGEN=OFF -DLLVM_INSTALL_UTILS=ON - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" - -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF ) use gold && mycmakeargs+=( -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include @@ -492,6 +510,7 @@ multilib_src_install_all() { _EOF_ docompress "/usr/lib/llvm/${SLOT}/share/man" + llvm_install_manpages } pkg_postinst() { diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest index 839676593fa5..eb5048936f17 100644 --- a/sys-devel/llvmgold/Manifest +++ b/sys-devel/llvmgold/Manifest @@ -1,5 +1,5 @@ EBUILD llvmgold-10.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064 -EBUILD llvmgold-11.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542 +EBUILD llvmgold-11.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064 EBUILD llvmgold-12.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542 EBUILD llvmgold-9.ebuild 564 BLAKE2B e50f9488b04a458b347f61f97b14269c0d9ba6440b46580b754efb82c0fac6b97dbbb617441a63539f14d5a25d42d4dd837836e879750561b2b9855105630185 SHA512 2dce5fa9bf42c6d9e55516e8595fba11b01a714b7007d474cbf6d345b95814691bfb4ff9fbdacfe617201cf88d8209d853f85970a443e7236d9ad84611d06064 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/sys-devel/llvmgold/llvmgold-11.ebuild b/sys-devel/llvmgold/llvmgold-11.ebuild index 7b4af30ab553..065dea585bc2 100644 --- a/sys-devel/llvmgold/llvmgold-11.ebuild +++ b/sys-devel/llvmgold/llvmgold-11.ebuild @@ -9,9 +9,8 @@ SRC_URI="" LICENSE="public-domain" SLOT="0" -KEYWORDS="" +KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux" IUSE="" -PROPERTIES="live" RDEPEND="sys-devel/llvm:${PV}[gold] !sys-devel/llvm:0" diff --git a/sys-devel/rust-std/Manifest b/sys-devel/rust-std/Manifest index be088cad5481..c4ea967e465d 100644 --- a/sys-devel/rust-std/Manifest +++ b/sys-devel/rust-std/Manifest @@ -1,3 +1,5 @@ DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05e5f571d22c2259328e7026c91e088c85f5de9c0536a16531e0cb10477bfcd16d3ac11467979f5561cb6199442b877ef SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4 +DIST rustc-1.47.0-src.tar.xz 104143736 BLAKE2B 0454094dde35275488046826da87655e51bf0795481d6d08fd70d644bfc12481bca8641166106ef32f20494906025244715b16ff21a1c023f4bd2818aab42521 SHA512 6ba83c0158f8130ddeae7e070417a2121d8a548c8fe97e28bce116d84048636c75aaee78e0c92cd43a50f5679a1223fc226cc8c5ba9bbd1465e84c5c6034d5c9 EBUILD rust-std-1.46.0.ebuild 3220 BLAKE2B 29a66cd46bbd78d716fe0e7db483865b1b5a8b12200202e21f061624be9b3385e9fc1561a092b2f21be9a7d6cb84b9460a1ffafc67ac2d90db95f99be0e69bfc SHA512 129ab7a762c6dc633dde21235ab3d7267d3cb9ed800cb3b506b0e5a2de3ccad8fe4e5a31f51eddda6e840b457b9883827f94fdf41f80b8ece54fde3ebabec7e1 +EBUILD rust-std-1.47.0.ebuild 3373 BLAKE2B bf6ddc56195edc24bef02017050d6983b2447b4850919e4e47c22160a5b073f89e44878a69dcd551e2795b8a80e779b63dce89bfb1507df47bdb43c840a8f746 SHA512 d3ba029e6948db6283d0f479c4567cd1423bb5762552e772951d8d2ab10d7fbe7df454d2a09b65ee0568fcf6c5927cdb850dc6797c974fac3a54ce9f31791f76 MISC metadata.xml 818 BLAKE2B 32766ac24fada44b46f8d4ef77164a4e4843b876347056223184ec6fe48af9a6e2fa7d3e1fd48dec299f328f37fbdf4c84225a7450b788ce3e6c92e87bf8f313 SHA512 c1c4a46790dedc83b6890bbb536927148b293eed7f4d3bbd1f602b7664a9b303ca9689d4d1d35ed8047c2c909d64145fc4098efbec279f630b86207b0216ca80 diff --git a/sys-devel/rust-std/rust-std-1.47.0.ebuild b/sys-devel/rust-std/rust-std-1.47.0.ebuild new file mode 100644 index 000000000000..46fc2485f617 --- /dev/null +++ b/sys-devel/rust-std/rust-std-1.47.0.ebuild @@ -0,0 +1,154 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit flag-o-matic multiprocessing python-any-r1 rust-toolchain toolchain-funcs + +DESCRIPTION="Rust standard library, standalone (for crossdev)" +HOMEPAGE="https://www.rust-lang.org" +SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz" + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" +SLOT="stable/$(ver_cut 1-2)" +# please do not keyword +#KEYWORDS="" #nowarn +IUSE="debug" + +BDEPEND=" + ${PYTHON_DEPS} + ~dev-lang/rust-${PV}:= +" + +DEPEND="|| + ( + >="${CATEGORY}"/gcc-4.7:* + >="${CATEGORY}"/clang-3.5:* + ) +" + +RDEPEND="${DEPEND}" + +# need full compiler to run tests +RESTRICT="test" + +QA_FLAGS_IGNORED="usr/lib/rust/${PV}/rustlib/.*/lib/lib.*.so" + +S="${WORKDIR}/${P/-std/c}-src" + +# +# The cross magic +# +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +is_cross() { + [[ ${CHOST} != ${CTARGET} ]] +} + +toml_usex() { + usex "$1" true false +} + +pkg_pretend() { + is_cross || die "${PN} should only be used for cross" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + # do the great cleanup + strip-flags + filter-flags '-mcpu=*' '-march=*' '-mtune=*' '-m32' '-m64' + strip-unsupported-flags + + local rust_root x + rust_root="$(rustc --print sysroot)" + rtarget="$(rust_abi ${CTARGET})" + rtarget="${ERUST_STD_RTARGET:-${rtarget}}" # some targets need to be custom. + rbuild="$(rust_abi ${CBUILD})" + rhost="$(rust_abi ${CHOST})" + + echo + for x in CATEGORY rust_root rbuild rhost rtarget RUSTFLAGS CFLAGS CXXFLAGS LDFLAGS; do + einfo "$(printf '%10s' ${x^^}:) ${!x}" + done + + cat <<- EOF > "${S}"/config.toml + [build] + build = "${rbuild}" + host = ["${rhost}"] + target = ["${rtarget}"] + cargo = "${rust_root}/bin/cargo" + rustc = "${rust_root}/bin/rustc" + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = true + verbose = 2 + cargo-native-static = false + [install] + prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" + sysconfdir = "etc" + docdir = "share/doc/rust" + bindir = "bin" + libdir = "lib" + mandir = "share/man" + [rust] + # https://github.com/rust-lang/rust/issues/54872 + codegen-units-std = 1 + optimize = true + debug = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + debuginfo-level-rustc = 0 + backtrace = true + incremental = false + default-linker = "$(tc-getCC)" + rpath = false + dist-src = false + remap-debuginfo = true + jemalloc = false + [dist] + src-tarball = false + [target.${rtarget}] + cc = "$(tc-getCC ${CTARGET})" + cxx = "$(tc-getCXX ${CTARGET})" + linker = "$(tc-getCC ${CTARGET})" + ar = "$(tc-getAR ${CTARGET})" + $(usex elibc_musl 'crt-static = false' '') + EOF + + einfo "${PN^} configured with the following settings:" + cat "${S}"/config.toml || die +} + +src_compile() { + env RUST_BACKTRACE=1 \ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ + library/std --stage 0 || die +} + +src_test() { + ewarn "${PN} can't run tests" +} + +src_install() { + local rustlib="lib/rust/${PV}/lib/rustlib" + dodir "/usr/${rustlib}" + pushd "build/${rhost}/stage0-sysroot/lib/rustlib" > /dev/null || die + cp -pPRv "${rtarget}" "${ED}/usr/${rustlib}" || die + popd > /dev/null || die +} |