From f62537c112bcf92c8e243e06a4b0a109b5c631d1 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Tue, 21 Dec 2021 22:50:00 +0100 Subject: dev-ada/gprbuild: use ${CHOST}-nm Closes: https://bugs.gentoo.org/829656 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone --- dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 11 ++++ dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 11 ++++ dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 80 +++++++++++++++++++++++ dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild | 86 +++++++++++++++++++++++++ dev-ada/gprbuild/gprbuild-22.0.0.ebuild | 83 ------------------------ 5 files changed, 188 insertions(+), 83 deletions(-) create mode 100644 dev-ada/gprbuild/files/gprbuild-2021-nm.patch create mode 100644 dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch create mode 100644 dev-ada/gprbuild/gprbuild-2021-r2.ebuild create mode 100644 dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild delete mode 100644 dev-ada/gprbuild/gprbuild-22.0.0.ebuild (limited to 'dev-ada') diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch new file mode 100644 index 000000000000..2bf41a8e1b07 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-21 21:36:45.306813518 +0100 ++++ b/share/gprconfig/linker.xml 2021-12-21 22:20:21.642668870 +0100 +@@ -128,7 +128,7 @@ + + + +- for Object_Lister use ("nm", "-g"); ++ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); + for Object_Lister_Matcher use " [TDRB] (.*)"; + + LDFLAGS := External_As_List ("LDFLAGS", " "); diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch new file mode 100644 index 000000000000..4455e8befffa --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-21 22:36:01.054738486 +0100 ++++ b/share/gprconfig/linker.xml 2021-12-21 22:36:59.973738600 +0100 +@@ -128,7 +128,7 @@ + + + +- for Object_Lister use ("nm", "-g"); ++ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); + for Object_Lister_Matcher use " [TDRB] (.*)"; + + package Linker is diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild new file mode 100644 index 000000000000..40a16cb9b2d4 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_202{0..1} ) + +inherit ada multiprocessing + +MYP=${P}-${PV}0519-19A34-src +ID=23a77a37247ff811609e23a0a271f445c299fc8f +XMLADA=xmlada-${PV}-${PV}0518-19D50-src +XMLADAID=6a2cf72f308cc787926b12ddc20993fcf2b8ea79 +ADAMIRROR=https://community.download.adacore.com/v1 + +DESCRIPTION="Multi-Language Management" +HOMEPAGE="http://libre.adacore.com/" +SRC_URI=" + ${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz + ${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${ADA_DEPS}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP} + +REQUIRED_USE="${ADA_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-nm.patch +) + +src_prepare() { + 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}:g" \ + src/gprlib.adb \ + || die +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + local xmlada_src="../${XMLADA}" + 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 ${LDFLAGS} gpr_imports.o || die + done + for lib in $lib_progs; do + gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ + -largs ${LDFLAGS} 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 +} diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild new file mode 100644 index 000000000000..2a07d5e4d71d --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_2021 ) + +inherit ada multiprocessing + +XMLADA=xmlada-${PV} +GPRCONFIG_KB=gprconfig_kb-${PV} + +DESCRIPTION="Multi-Language Management" +HOMEPAGE="http://libre.adacore.com/" +SRC_URI=" + https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz + -> ${XMLADA}.tar.gz + https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz + -> ${GPRCONFIG_KB}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${ADA_DEPS}" +RDEPEND="${DEPEND}" + +REQUIRED_USE="${ADA_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-nm.patch +) + +src_prepare() { + kb_src=../${GPRCONFIG_KB} + + # Install the gprconfig knowledge base + rm -rf share/gprconfig + cp -r "$kb_src"/db share/gprconfig || die + + 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}:g" \ + src/gprlib.adb \ + || die +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + local xmlada_src="../${XMLADA}" + 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 ${LDFLAGS} gpr_imports.o || die + done + for lib in $lib_progs; do + gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ + -largs ${LDFLAGS} gpr_imports.o || die + done +} + +src_install() { + dobin ${bin_progs} + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + insinto /usr/share/gprconfig + doins share/gprconfig/*.xml + doins share/gprconfig/*.ent + insinto /usr/share/gpr + doins share/_default.gpr + einstalldocs +} diff --git a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0.ebuild deleted file mode 100644 index 6de6ca467e32..000000000000 --- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ADA_COMPAT=( gnat_2021 ) - -inherit ada multiprocessing - -XMLADA=xmlada-${PV} -GPRCONFIG_KB=gprconfig_kb-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI=" - https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz - https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz - -> ${XMLADA}.tar.gz - https://github.com/AdaCore/gprconfig_kb/archive/refs/tags/v${PV}.tar.gz - -> ${GPRCONFIG_KB}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="${ADA_DEPS}" -RDEPEND="${DEPEND}" - -REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - kb_src=../${GPRCONFIG_KB} - - # Install the gprconfig knowledge base - rm -rf share/gprconfig - cp -r "$kb_src"/db share/gprconfig || die - - 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}:g" \ - src/gprlib.adb \ - || die -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - local xmlada_src="../${XMLADA}" - 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 ${LDFLAGS} gpr_imports.o || die - done - for lib in $lib_progs; do - gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs ${LDFLAGS} gpr_imports.o || die - done -} - -src_install() { - dobin ${bin_progs} - exeinto /usr/libexec/gprbuild - doexe ${lib_progs} - insinto /usr/share/gprconfig - doins share/gprconfig/*.xml - doins share/gprconfig/*.ent - insinto /usr/share/gpr - doins share/_default.gpr - einstalldocs -} -- cgit v1.2.3-65-gdbad