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 C983A138334 for ; Sat, 27 Oct 2018 20:27:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4937E0924; Sat, 27 Oct 2018 20:27:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 81556E0924 for ; Sat, 27 Oct 2018 20:27:20 +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 2469D335C8F for ; Sat, 27 Oct 2018 20:27:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C36D143D for ; Sat, 27 Oct 2018 20:27:16 +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: <1540672024.e7d7485e2922d66450f2cecbc8967f81f168646b.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ada/gprbuild/files/gprbuild-2017-config.patch dev-ada/gprbuild/gprbuild-2017-r1.ebuild X-VCS-Directories: dev-ada/gprbuild/ dev-ada/gprbuild/files/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: e7d7485e2922d66450f2cecbc8967f81f168646b X-VCS-Branch: master Date: Sat, 27 Oct 2018 20:27:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e62186b4-0dbe-42e4-bc3d-b9f66e46ebb3 X-Archives-Hash: ab72c0c10d58bf81691daa18905571a3 commit: e7d7485e2922d66450f2cecbc8967f81f168646b Author: Tupone Alfredo gentoo org> AuthorDate: Sat Oct 27 20:27:04 2018 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Oct 27 20:27:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7d7485e dev-ada/gprbuild: Fix configuration for 2017 version too Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2017-config.patch | 113 ++++++++++++++++++++++ dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 89 +++++++++++++++++ 2 files changed, 202 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch new file mode 100644 index 00000000000..72f1fd829c1 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch @@ -0,0 +1,113 @@ +--- a/share/gprconfig/compilers.xml 2018-10-27 09:04:53.830077299 +0200 ++++ b/share/gprconfig/compilers.xml 2018-10-27 09:05:14.883724079 +0200 +@@ -20,15 +20,15 @@ + + + GCC +- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc ++ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@ + +- ${PREFIX}gcc -v ++ ${PREFIX}gcc-@VER@ -v + + + + C + +- ${PREFIX}gcc -dumpmachine ++ ${PREFIX}gcc-@VER@ -dumpmachine + + + +@@ -325,14 +325,14 @@ + --> + + GNAT +- (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls ++ (.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*-pc-mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gnatls-@VER@ + +- ${PREFIX}gnatls -v --version ++ ${PREFIX}gnatls-@VER@ -v --version + + + Ada + +- ${PREFIX}gcc -v ++ ${PREFIX}gcc-@VER@ -v + + + +@@ -342,7 +342,7 @@ + \.\./$TARGET/lib/gnat/(.*)/adalib/ + + +- ${PREFIX}gcc -dumpmachine ++ ${PREFIX}gcc-@VER@ -dumpmachine + + + +@@ -509,21 +509,6 @@ + + + +- +- +- LLVM +- clang +- +- clang -v +- +- +- C +- +- clang -dumpmachine +- +- +- +- + + + WINDRES +--- a/share/gprconfig/gnat.xml 2018-10-27 09:38:31.615357671 +0200 ++++ b/share/gprconfig/gnat.xml 2018-10-27 09:40:54.603044560 +0200 +@@ -60,7 +60,7 @@ + &filter_gnat; + + package Compiler is +- for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc"; ++ for Driver ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@"; + for Language_Kind ("Ada") use "unit_based"; + for Dependency_Kind ("Ada") use "ALI_File"; + for Leading_Required_Switches ("Ada") use +@@ -77,6 +77,9 @@ + for Objects_Path_File ("Ada") use "ADA_PRJ_OBJECTS_FILE"; + for Driver ("Ada") use + "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind"; ++ for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@"); ++ for Required_Switches ("Ada") use ++ Binder'Required_Switches ("Ada") & ("--RTS=${RUNTIME_DIR(ada)}"); + end Binder; + + for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; +--- a/share/gprconfig/c.xml 2018-10-27 09:42:01.327035277 +0200 ++++ b/share/gprconfig/c.xml 2018-10-27 09:42:16.529803718 +0200 +@@ -14,7 +14,7 @@ + + + package Compiler is +- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; ++ for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; + end Compiler; + + +--- a/share/gprconfig/linker.xml 2018-10-27 09:43:17.934862859 +0200 ++++ b/share/gprconfig/linker.xml 2018-10-27 09:43:54.127304471 +0200 +@@ -742,7 +742,7 @@ + for Shared_Library_Suffix use ".sl"; + for Library_Auto_Init_Supported use "true"; + for Run_Path_Option use ("-Wl,+b,"); +- for Library_Partial_Linker use ("gcc", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); + + package Linker is + for Max_Command_Line_Length use "5000"; diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild new file mode 100644 index 00000000000..1f443284e87 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs multiprocessing + +MYP=${PN}-gpl-${PV} + +DESCRIPTION="Multi-Language Management" +HOMEPAGE="http://libre.adacore.com/" +SRC_URI=" + http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 + -> ${MYP}-src.tar.gz + http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8 + -> xmlada-gpl-${PV}-src.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnat_2016 +gnat_2017 gnat_2018" + +DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-config.patch +) + +src_prepare() { + if use gnat_2016; then + GCC_PV=4.9.4 + else + GCC_PV=6.3.0 + fi + default + sed -i \ + -e "s:@VER@:${GCC_PV}:g" \ + share/gprconfig/compilers.xml \ + share/gprconfig/gnat.xml \ + share/gprconfig/c.xml \ + share/gprconfig/linker.xml \ + || die + sed -i \ + -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ + src/gprlib.adb \ + || die +} + +src_configure() { + emake prefix="${D}"usr setup +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + GCC=${CHOST}-gcc-${GCC_PV} + GNATMAKE=${CHOST}-gnatmake-${GCC_PV} + local xmlada_src="../xmlada-gpl-${PV}-src" + incflags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \ + -I${xmlada_src}/schema -I${xmlada_src}/unicode \ + -I${xmlada_src}/input_sources" + ${GCC} -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die + for bin in ${bin_progs}; do + ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ + -o ${bin} -largs gpr_imports.o || die + done + for lib in $lib_progs; do + ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ + -largs gpr_imports.o || die + done +} + +src_install() { + dobin ${bin_progs} + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + insinto /usr/share/gprconfig + doins share/gprconfig/* + insinto /usr/share/gpr + doins share/_default.gpr + einstalldocs +}