From 1340f40143dcafb4f0d64de0fb7b58de01a892f5 Mon Sep 17 00:00:00 2001 From: Tupone Alfredo Date: Fri, 19 Oct 2018 22:29:47 +0200 Subject: dev-ada/gprbuild: Fix gnatbind path Closes: https://bugs.gentoo.org/668964 Signed-off-by: Alfredo Tupone Package-Manager: Portage-2.3.49, Repoman-2.3.11 --- dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 10 +++ dev-ada/gprbuild/gprbuild-2018-r2.ebuild | 93 ----------------------- dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 93 +++++++++++++++++++++++ 3 files changed, 103 insertions(+), 93 deletions(-) delete mode 100644 dev-ada/gprbuild/gprbuild-2018-r2.ebuild create mode 100644 dev-ada/gprbuild/gprbuild-2018-r3.ebuild (limited to 'dev-ada') diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index 9f62ec9ff9d4..1f967b61d4c7 100644 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -241,6 +241,16 @@ 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-17 21:31:44.442501471 +0200 +++ b/share/gprconfig/c.xml 2018-10-17 21:33:06.562088044 +0200 @@ -14,7 +14,7 @@ diff --git a/dev-ada/gprbuild/gprbuild-2018-r2.ebuild b/dev-ada/gprbuild/gprbuild-2018-r2.ebuild deleted file mode 100644 index 91e3da95792d..000000000000 --- a/dev-ada/gprbuild/gprbuild-2018-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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/5b0819dfc7a447df26c27a68 - -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 - -> 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 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP}-src - -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2016; then - GCC_PV=4.9.4 - elif use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=7.3.1 - 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 -# sed -i \ -# -e "s:\"-Wl,-r\":\"-r\":g" \ -# share/gprconfig/linker.xml \ -# || 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 - insinto /usr/share/gprconfig - einstalldocs -} diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild new file mode 100644 index 000000000000..91e3da95792d --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild @@ -0,0 +1,93 @@ +# 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/5b0819dfc7a447df26c27a68 + -> ${MYP}-src.tar.gz + http://mirrors.cdn.adacore.com/art/5b0819dec7a447df26c27a40 + -> 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 ) + gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_prepare() { + if use gnat_2016; then + GCC_PV=4.9.4 + elif use gnat_2017; then + GCC_PV=6.3.0 + else + GCC_PV=7.3.1 + 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 +# sed -i \ +# -e "s:\"-Wl,-r\":\"-r\":g" \ +# share/gprconfig/linker.xml \ +# || 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 + insinto /usr/share/gprconfig + einstalldocs +} -- cgit v1.2.3-65-gdbad