From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F35BD138334 for ; Wed, 7 Nov 2018 06:55:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D60F5E0971; Wed, 7 Nov 2018 06:55:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 923E4E0971 for ; Wed, 7 Nov 2018 06:55:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1170D335C0C for ; Wed, 7 Nov 2018 06:55:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D063A443 for ; Wed, 7 Nov 2018 06:55:46 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1541573728.0e161152fae9e8572f0b94e68660c05fede377e6.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/Manifest dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild dev-lang/gnat-gpl/gnat-gpl-2016.ebuild dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild X-VCS-Directories: dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 0e161152fae9e8572f0b94e68660c05fede377e6 X-VCS-Branch: master Date: Wed, 7 Nov 2018 06:55:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ecbcdfc-941b-4275-b816-5f3030298e64 X-Archives-Hash: 63d72e341f0fc0e66da6e28c11b3b0df commit: 0e161152fae9e8572f0b94e68660c05fede377e6 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Nov 7 06:55:28 2018 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 7 06:55:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e161152 dev-lang/gnat-gpl: stabilize and drop old Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-lang/gnat-gpl/Manifest | 1 - dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild | 2 +- dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 214 ------------------------------ dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild | 2 +- 4 files changed, 2 insertions(+), 217 deletions(-) diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest index 3b51ed405b9..4f3d64a96a9 100644 --- a/dev-lang/gnat-gpl/Manifest +++ b/dev-lang/gnat-gpl/Manifest @@ -1,7 +1,6 @@ DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf -DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812 DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild index ac29e3d9590..5d44cf0a9f7 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild @@ -50,7 +50,7 @@ SRC_URI+=" LICENSE+=" GPL-2 GPL-3" SLOT="${TOOLCHAIN_GCC_PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="bootstrap" RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild deleted file mode 100644 index 89ae61b4668..00000000000 --- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PATCH_VER="1.2" -UCLIBC_VER="1.0" - -# Hardened gcc 4 stuff -PIE_VER="0.6.4" -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 - -TOOLCHAIN_GCC_PV=4.9.4 - -inherit eutils toolchain-funcs toolchain - -REL=4.9 -MYP=gcc-${REL}-gpl-${PV}-src -BTSTRP_X86=gnat-gpl-2014-x86-linux-bin -BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin - -DESCRIPTION="GNAT Ada Compiler - GPL version" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI+=" - http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f - -> ${P}-src.tar.gz - http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db - -> ${MYP}.tar.gz - http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d - -> gcc-interface-${REL}-gpl-${PV}-src.tar.gz - bootstrap? ( - amd64? ( - http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> - ${BTSTRP_AMD64}.tar.gz - ) - x86? ( - http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> - ${BTSTRP_X86}.tar.gz - ) - )" - -LICENSE+=" GPL-2 GPL-3" -SLOT="${TOOLCHAIN_GCC_PV}" -KEYWORDS="amd64 x86" -IUSE="bootstrap" - -RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}" -DEPEND="${RDEPEND} - elibc_glibc? ( >=sys-libs/glibc-2.8 ) - >=sys-devel/binutils-2.20" - -PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )" - -S="${WORKDIR}"/${MYP} - -FSFGCC=gcc-${TOOLCHAIN_GCC_PV} - -pkg_setup() { - toolchain_pkg_setup - - if use amd64; then - BTSTRP=${BTSTRP_AMD64} - else - BTSTRP=${BTSTRP_X86} - fi - if use bootstrap; then - GCC="${WORKDIR}"/${BTSTRP}/bin/gcc - else - GCC=${ADA:-$(tc-getCC)} - fi - CC=${GCC} - local base=$(basename ${GCC}) - CXX="${base/gcc/g++}" - GNATMAKE="${base/gcc/gnatmake}" - GNATBIND="${base/gcc/gnatbind}" - if [[ ${base} != ${GCC} ]] ; then - local path=$(dirname ${GCC}) - GNATMAKE="${path}/${GNATMAKE}" - GNATBIND="${path}/${GNATBIND}" - CXX="${path}/${CXX}" - fi -} - -src_unpack() { - if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then - eerror "You need a gcc compiler that provides the Ada Compiler:" - eerror "1) use gcc-config to select the right compiler or" - eerror "2) set the bootstrap use flag" - die "ada compiler not available" - fi - - GCC_A_FAKEIT="${P}-src.tar.gz - ${MYP}.tar.gz - ${FSFGCC}.tar.bz2 - gcc-interface-${REL}-gpl-${PV}-src.tar.gz" - if use bootstrap; then - GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz" - fi - - toolchain_src_unpack - if use bootstrap; then - rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die - fi -} - -src_prepare() { - mv ../${P}-src/src/ada gcc/ || die - mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die - - sed -i \ - -e "s:gnatmake:${GNATMAKE}:g" \ - gcc/ada/Make-generated.in || die "sed failed" - - sed -i \ - -e "/xoscons/s:gnatmake:${GNATMAKE}:g" \ - gcc/ada/gcc-interface/Makefile.in || die "sed failed" - - mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die - mv ../${FSFGCC}/libjava . || die - rm -r ../${FSFGCC} || die - - cd .. - epatch "${FILESDIR}"/${P}-gentoo.patch - rm patch/10_all_default-fortify-source.patch - rm piepatch/34_all_gcc48_config_i386.patch - cd - - - if has_version '=glibc-2.12 #362315" - EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch" - fi - - # Bug 638056 - epatch "${FILESDIR}/${P}-bootstrap.patch" - - toolchain_src_prepare - - use vanilla && return 0 - # Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. - [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch -} - -src_configure() { - local trueGCC_BRANCH_VER=${GCC_BRANCH_VER} - GCC_BRANCH_VER=$(gcc-version) - downgrade_arch_flags - GCC_BRANCH_VER=${trueGCC_BRANCH_VER} - toolchain_src_configure \ - --enable-languages=ada \ - --disable-libada \ - CC=${GCC} \ - GNATBIND=${GNATBIND} \ - GNATMAKE=yes -} - -src_compile() { - unset ADAFLAGS - toolchain_src_compile - gcc_do_make "-C gcc gnatlib-shared" - ln -s gcc ../build/prev-gcc || die - ln -s ${CHOST} ../build/prev-${CHOST} || die - gcc_do_make "-C gcc gnattools" -} - -src_install() { - toolchain_src_install - cd "${D}"${BINPATH} - for x in gnat*; do - # For some reason, g77 gets made instead of ${CTARGET}-g77... - # this should take care of that - if [[ -f ${x} ]] ; then - # In case they're hardlinks, clear out the target first - # otherwise the mv below will complain. - rm -f ${CTARGET}-${x} - mv ${x} ${CTARGET}-${x} - fi - - if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi - # Create versioned symlinks - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} - fi - - if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then - rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} - ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} - fi - done -} - -pkg_postinst () { - toolchain_pkg_postinst - einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more" - einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}" - einfo "Even if the c/c++ compilers are using almost the same patched" - einfo "source as the sys-devel/gcc package its use is not extensively" - einfo "tested, and not supported for updating your system, except for ada" - einfo "related packages" -} diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild index 13a8539ec19..997ac806895 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild @@ -36,7 +36,7 @@ SRC_URI+=" )" LICENSE+=" GPL-2 GPL-3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+bootstrap" RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"