[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d50e82bdba1aed72e9d23e0e0a78e6c700e22da9 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Mar 1 18:18:07 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Mar 1 18:18:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50e82bd dev-ada/gprbuild: add doc Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 3 +-- ...{gprbuild-24.0.0.ebuild => gprbuild-24.0.0-r1.ebuild} | 16 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild index 1f7821924fab..e340685fb095 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,6 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" DEPEND="${ADA_DEPS} dev-ada/gprconfig_kb[${ADA_USEDEP}]" diff --git a/dev-ada/gprbuild/gprbuild-24.0.0.ebuild b/dev-ada/gprbuild/gprbuild-24.0.0-r1.ebuild similarity index 83% rename from dev-ada/gprbuild/gprbuild-24.0.0.ebuild rename to dev-ada/gprbuild/gprbuild-24.0.0-r1.ebuild index 4ca1962e2cdc..d3d2cd3da286 100644 --- a/dev-ada/gprbuild/gprbuild-24.0.0.ebuild +++ b/dev-ada/gprbuild/gprbuild-24.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,10 +19,12 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" +IUSE="doc" DEPEND="${ADA_DEPS} dev-ada/gprconfig_kb[${ADA_USEDEP}]" RDEPEND="${DEPEND}" +BDEPEND="doc? ( dev-python/sphinx )" REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) @@ -56,6 +58,11 @@ src_compile() { gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ -largs ${LDFLAGS} gpr_imports.o || die done + if use doc; then + emake -C doc txt + emake -C doc info + emake -C doc html + fi } src_install() { @@ -64,5 +71,12 @@ src_install() { doexe ${lib_progs} insinto /usr/share/gpr doins share/_default.gpr + local HTML_DOCS= + local DOCS=README.md + if use doc; then + DOCS+=" examples doc/txt/gprbuild_ug.txt" + HTML_DOCS+="doc/html/*" + doinfo doc/info/gprbuild_ug.info + fi einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: a36a60d47cda129b914c02fe274f86f375fef596 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Dec 31 18:29:09 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Dec 31 18:29:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36a60d4 dev-ada/gprbuild: add 24.0.0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 ++ dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild | 1 - dev-ada/gprbuild/{gprbuild-23.0.0-r2.ebuild => gprbuild-24.0.0.ebuild} | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 3d698cb5a410..739fc4060149 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,2 +1,4 @@ DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5 +DIST gprbuild-24.0.0.tar.gz 959615 BLAKE2B c432b1f13a1aecb8f664aeb06694d86123268f29b43a50f5c7a48d7428c0b1c16f397e5a84c097aba04c7ee34011df119b154fd546ce156c999a54d159a84afb SHA512 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03 DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb +DIST xmlada-24.0.0.tar.gz 1053363 BLAKE2B 628a1d3645c58cc3f8f5140c7cfb16adef02f6ccc72b8e9410819eaf67e0160bdcf81a8e33065ec52f54cb12309d857a3d82e532990a0fd17c249c04334ab10f SHA512 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild index 375ab9cd0103..4ca1962e2cdc 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild @@ -19,7 +19,6 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="${ADA_DEPS} dev-ada/gprconfig_kb[${ADA_USEDEP}]" diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-24.0.0.ebuild similarity index 99% copy from dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild copy to dev-ada/gprbuild/gprbuild-24.0.0.ebuild index 375ab9cd0103..4ca1962e2cdc 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-24.0.0.ebuild @@ -19,7 +19,6 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="${ADA_DEPS} dev-ada/gprconfig_kb[${ADA_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 5f381373313ceb1c0633c4521c2f525f61cdc5ad Author: Alfredo Tupone gentoo org> AuthorDate: Mon Nov 6 06:52:35 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 6 06:52:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f381373 dev-ada/gprbuild: destabilize 23.0.0-r2 for ~amd64, ~x86 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild index 78fca49351f9..375ab9cd0103 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="${ADA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 60e22ad2e83f3054006df878b49e3dad35fc88de Author: Alfredo Tupone gentoo org> AuthorDate: Mon Nov 6 06:49:19 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 6 06:49:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e22ad2 dev-ada/gprbuild: add support to gcc:13 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild | 69 ++ 1 file changed, 69 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild new file mode 100644 index ..78fca49351f9 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 ) + +inherit ada multiprocessing + +XMLADA=xmlada-${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" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="${ADA_DEPS} + dev-ada/gprconfig_kb[${ADA_USEDEP}]" +RDEPEND="${DEPEND}" + +REQUIRED_USE="${ADA_REQUIRED_USE}" +PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) + +src_prepare() { + default + sed -i \ + -e "s:@GNATBIND@:${GNATBIND}:g" \ + src/gprlib.adb \ + || die + cd gpr/src || die + ln -s gpr-util-put_resource_usage__unix.adb \ + gpr-util-put_resource_usage.adb +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + local xmlada_src="../${XMLADA}" + inc_flags="-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) ${inc_flags} $ADAFLAGS ${bin}-main \ + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die + done + for lib in $lib_progs; do + gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ + -largs ${LDFLAGS} gpr_imports.o || die + done +} + +src_install() { + dobin ${bin_progs} + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + insinto /usr/share/gpr + doins share/_default.gpr + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 4aae0e94d34b807c494fae27b808b9f83a055a50 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Mar 21 20:54:11 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Mar 21 21:00:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aae0e94 dev-ada/gprbuild: drop gcc_12_2_0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild index 9649280c1c56..1f7821924fab 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 ) +ADA_COMPAT=( gnat_2021 gcc_12 ) inherit ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: fdee4256612a4add92611315e8d2492e6d9b752b Author: Alfredo Tupone gentoo org> AuthorDate: Mon Mar 20 20:36:44 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Mar 20 20:39:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdee4256 dev-ada/gprbuild: stabilize 23.0.0-r1 for x86 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild index 9c50dd3a345c..9649280c1c56 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 9bbe937965552e1bd9e07f2badb4d5eee07ccd88 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Mar 20 19:12:42 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Mar 20 19:18:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbe9379 dev-ada/gprbuild: remove old, EAPI 8 amd64 stable Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 2 +- dev-ada/gprbuild/gprbuild-23.0.0.ebuild| 69 -- 2 files changed, 1 insertion(+), 70 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild index 3e090bfd7e4d..9c50dd3a345c 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="${ADA_DEPS} diff --git a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild deleted file mode 100644 index 3b99fe68bb8c.. --- a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) - -inherit ada multiprocessing - -XMLADA=xmlada-${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" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="${ADA_DEPS} - dev-ada/gprconfig_kb[${ADA_USEDEP}]" -RDEPEND="${DEPEND}" - -REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) - -src_prepare() { - default - sed -i \ - -e "s:@GNATBIND@:${GNATBIND}:g" \ - src/gprlib.adb \ - || die - cd gpr/src || die - ln -s gpr-util-put_resource_usage__unix.adb \ - gpr-util-put_resource_usage.adb -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - local xmlada_src="../${XMLADA}" - inc_flags="-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) ${inc_flags} $ADAFLAGS ${bin}-main \ - -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die - done - for lib in $lib_progs; do - gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ - -largs ${LDFLAGS} gpr_imports.o || die - done -} - -src_install() { - dobin ${bin_progs} - exeinto /usr/libexec/gprbuild - doexe ${lib_progs} - insinto /usr/share/gpr - doins share/_default.gpr - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 7e4f8d155d7f364489d7a22fbe70101a0494ea48 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Feb 2 09:17:25 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Feb 2 09:20:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4f8d15 dev-ada/gprbuild: update EAPI 7 -> 8 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 69 ++ 1 file changed, 69 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild new file mode 100644 index ..3e090bfd7e4d --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 ) + +inherit ada multiprocessing + +XMLADA=xmlada-${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" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${ADA_DEPS} + dev-ada/gprconfig_kb[${ADA_USEDEP}]" +RDEPEND="${DEPEND}" + +REQUIRED_USE="${ADA_REQUIRED_USE}" +PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) + +src_prepare() { + default + sed -i \ + -e "s:@GNATBIND@:${GNATBIND}:g" \ + src/gprlib.adb \ + || die + cd gpr/src || die + ln -s gpr-util-put_resource_usage__unix.adb \ + gpr-util-put_resource_usage.adb +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + local xmlada_src="../${XMLADA}" + inc_flags="-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) ${inc_flags} $ADAFLAGS ${bin}-main \ + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die + done + for lib in $lib_progs; do + gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ + -largs ${LDFLAGS} gpr_imports.o || die + done +} + +src_install() { + dobin ${bin_progs} + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + insinto /usr/share/gpr + doins share/_default.gpr + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 78594100b1bcf3d4d1cce003cee47d02443c3f1c Author: Alfredo Tupone gentoo org> AuthorDate: Thu Feb 2 08:03:27 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Feb 2 08:22:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78594100 dev-ada/gprbuild: drop 22.0.0-r4 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2021-runpath.patch | 11 dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild | 68 -- 3 files changed, 81 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index fd032b1bc3ce..3d698cb5a410 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,2 @@ -DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5 -DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch deleted file mode 100644 index 9224a09f9049.. --- a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch +++ /dev/null @@ -1,11 +0,0 @@ a/gpr/src/gpr-util.adb 2022-03-19 22:41:32.372348082 +0100 -+++ b/gpr/src/gpr-util.adb 2022-03-19 22:41:54.325010633 +0100 -@@ -3634,7 +3634,7 @@ - end if; - end loop; - -- return Ret; -+ return Ret(1 .. Length - Separator'Length); - end; -end Concat_Paths; - diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild deleted file mode 100644 index e525376e58fd.. --- a/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) - -inherit ada multiprocessing - -XMLADA=xmlada-${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" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="${ADA_DEPS} - ~dev-ada/gprconfig_kb-${PV}[${ADA_USEDEP}]" -RDEPEND="${DEPEND}" - -REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${PN}-2021-runpath.patch -) - -src_prepare() { - default - 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/gpr - doins share/_default.gpr - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: daf8b0a42113e371cfd4f3e31aa99c5e6c73da22 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jan 15 19:57:12 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jan 15 20:54:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf8b0a4 dev-ada/gprbuild: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29120 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 12 1 file changed, 12 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch deleted file mode 100644 index 6a9513473bf9.. --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch +++ /dev/null @@ -1,12 +0,0 @@ a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 -+++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 -@@ -877,7 +877,8 @@ - - - -- for Archive_Builder use ("ar", "cr"); -+ AR := External("AR", "ar"); -+ for Archive_Builder use (AR, "cr"); -for Archive_Builder_Append_Option use ("q"); -for Archive_Indexer use ("ranlib"); -for Archive_Suffix use ".a";
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 737f1ac9f30a165c829bcd3868020e10f33c6727 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Jan 15 10:13:29 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jan 15 10:14:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737f1ac9 dev-ada/gprbuild/files: remove unused files Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 292 -- dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 12 - 2 files changed, 304 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch deleted file mode 100644 index 15264d6828e6.. --- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch +++ /dev/null @@ -1,292 +0,0 @@ a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 -+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 -@@ -266,7 +266,9 @@ - -Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - -Compiler_Name : String_Access := new String'("gcc"); - -@@ -2081,7 +2083,7 @@ - and then Line (Last - 2 .. Last) = "gcc" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 3) & "objcopy"); - -@@ -2089,7 +2091,7 @@ - and then Line (Last - 6 .. Last) = "gcc.exe" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 7) & "objcopy"); - end if; -@@ -2241,7 +2243,13 @@ -Mapping_File_Name := new String'(Line (1 .. Last)); - - when Binding_Options => -- Binding_Options_Table.Append (Line (1 .. Last)); -+ if Last > Gnatbind_Path_Option'Length -+ and then Line (1 .. Gnatbind_Path_Option'Length) = -+ Gnatbind_Path_Option then -+ null; -+ else -+ Binding_Options_Table.Append (Line (1 .. Last)); -+ end if; - - when Copy_Source_Dir => -Copy_Source_Directory := new String'(Line (1 .. Last)); a/share/gprconfig/compilers.xml2019-06-01 21:29:57.611722804 +0200 -+++ b/share/gprconfig/compilers.xml2019-06-01 21:42:56.000608601 +0200 -@@ -20,15 +20,15 @@ - - - GCC --(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*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-|.*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 - - - -@@ -185,14 +185,14 @@ ---> - - GNAT --(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls -+(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@ - -- ${PREFIX}gnatls -v --version -+ ${PREFIX}gnatls-@VER@ -v --version - - - Ada - -- ${PREFIX}gcc -v -+ ${PREFIX}gcc-@VER@ -v - - - -@@ -202,68 +202,11 @@ -\.\./$TARGET/lib/gnat/(.*)/adalib/ - - -- ${PREFIX}gcc -dumpmachine -+ ${PREFIX}gcc-@VER@ -dumpmachine - - - - -- -- -- --GNAT_CODEPEER --(.*gnsa-|.*codepeer-)gnatls -- -- ${PREFIX}gnatls -v -- -- --Ada,C,C++ --
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d3cf34f97afc09eed68847e57e0a693065990427 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Jan 13 22:10:58 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jan 13 22:10:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cf34f9 dev-ada/gprbuild: drop 2021-r2, 2021-r4 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest| 2 - dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 78 -- dev-ada/gprbuild/gprbuild-2021-r4.ebuild | 83 3 files changed, 163 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index f3189872e468..fd032b1bc3ce 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,6 +1,4 @@ -DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5 -DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild deleted file mode 100644 index 2104fdd636e8.. --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ADA_COMPAT=( gnat_2021 ) - -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 ) - -src_prepare() { - default - sed -i \ - -e "s:@VER@:${GCC_PV}:g" \ - -e "s:\$gcc_version:${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 \ -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 1a913d6f297b6a1451f416f82aeaef9c802f7f70 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Jan 13 22:06:09 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jan 13 22:06:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a913d6f dev-ada/gprbuild: stabilize all arch Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild | 4 ++-- dev-ada/gprbuild/gprbuild-23.0.0.ebuild| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild index 2cb87211498b..e525376e58fd 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS} diff --git a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild index ed54d7113f35..3b99fe68bb8c 100644 --- a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild +++ b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 9ce79a6988efb607cab32e50878ddd19fab7506e Author: Alfredo Tupone gentoo org> AuthorDate: Fri Dec 2 20:59:27 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Dec 2 20:59:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce79a69 dev-ada/gprbuild: add 23.0.0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/gprbuild-23.0.0.ebuild | 69 + 2 files changed, 71 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 408939bb5cc6..f3189872e468 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,6 @@ DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a +DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e +DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb diff --git a/dev-ada/gprbuild/gprbuild-23.0.0.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild new file mode 100644 index ..ed54d7113f35 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-23.0.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) + +inherit ada multiprocessing + +XMLADA=xmlada-${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" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="${ADA_DEPS} + dev-ada/gprconfig_kb[${ADA_USEDEP}]" +RDEPEND="${DEPEND}" + +REQUIRED_USE="${ADA_REQUIRED_USE}" +PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch ) + +src_prepare() { + default + sed -i \ + -e "s:@GNATBIND@:${GNATBIND}:g" \ + src/gprlib.adb \ + || die + cd gpr/src || die + ln -s gpr-util-put_resource_usage__unix.adb \ + gpr-util-put_resource_usage.adb +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + local xmlada_src="../${XMLADA}" + inc_flags="-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) ${inc_flags} $ADAFLAGS ${bin}-main \ + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die + done + for lib in $lib_progs; do + gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \ + -largs ${LDFLAGS} gpr_imports.o || die + done +} + +src_install() { + dobin ${bin_progs} + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + insinto /usr/share/gpr + doins share/_default.gpr + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 6f73e4f973f352b2af9793949d48aa075871a3c1 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Dec 2 08:06:17 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Dec 2 08:07:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f73e4f9 dev-ada/gprbuild: use only gprconfig_kb 22.0.0 Signed-off-by: Alfredo Tupone gentoo.org> .../gprbuild/{gprbuild-22.0.0-r3.ebuild => gprbuild-22.0.0-r4.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild similarity index 97% rename from dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild rename to dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild index 9c520cc6d4a1..2cb87211498b 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r3.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r4.ebuild @@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="${ADA_DEPS} - dev-ada/gprconfig_kb[${ADA_USEDEP}]" + ~dev-ada/gprconfig_kb-${PV}[${ADA_USEDEP}]" RDEPEND="${DEPEND}" REQUIRED_USE="${ADA_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 441be14b229eefa4828a8b991ae34eaed42db79f Author: Alfredo Tupone gentoo org> AuthorDate: Sat Nov 26 19:39:08 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Nov 26 19:39:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441be14b dev-ada/gprbuild: drop gnat_2020 support Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2021-r2.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2021-r4.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild index d4c11ac277e3..2104fdd636e8 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_202{0..1} ) +ADA_COMPAT=( gnat_2021 ) inherit ada multiprocessing diff --git a/dev-ada/gprbuild/gprbuild-2021-r4.ebuild b/dev-ada/gprbuild/gprbuild-2021-r4.ebuild index 519b60dab006..4d2009e3d974 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r4.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_202{0..1} gcc_12_2_0 ) +ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) inherit ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 6c8be7b7143253060636432da4db16f63fe3e18e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Nov 25 15:50:49 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Fri Nov 25 17:47:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8be7b7 dev-ada/gprbuild: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28426 Signed-off-by: Conrad Kostecki gentoo.org> dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 12 1 file changed, 12 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch deleted file mode 100644 index 062d7960fce7.. --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch +++ /dev/null @@ -1,12 +0,0 @@ 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,8 @@ - - - -- for Object_Lister use ("nm", "-g"); -+ NM := External("NM", "nm"); -+ for Object_Lister use (NM, "-g"); -for Object_Lister_Matcher use " [TDRB] (.*)"; - -package Linker is
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: edbcf396d0d83b65977186af2a5c530e2b5df30a Author: Alfredo Tupone gentoo org> AuthorDate: Thu Nov 24 20:25:31 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Nov 24 20:26:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edbcf396 dev-ada/gprbuild: separate gprconfig_kb Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 1 - dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch | 47 .../gprbuild/files/gprbuild-22.0.0-gentoo.patch| 246 - ...-22.0.0-r2.ebuild => gprbuild-22.0.0-r3.ebuild} | 41 +--- 4 files changed, 4 insertions(+), 331 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index adc6ed460a2d..408939bb5cc6 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,5 +1,4 @@ DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a -DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch deleted file mode 100644 index ba5c2f858de7.. --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch +++ /dev/null @@ -1,47 +0,0 @@ a/gpr/src/gpr_imports.c2022-02-27 10:10:34.053638209 +0100 -+++ b/gpr/src/gpr_imports.c2022-02-27 10:12:03.898276758 +0100 -@@ -114,6 +114,44 @@ - const char *__gnat_default_libgcc_subdir = "lib"; - #endif - -+#include -+#include -+#include -+#include -+ -+ extern long long __gnat_file_time(char* name) -+ { -+long long result; -+ -+if (name == NULL) { -+ return LLONG_MIN; -+} -+/* Number of seconds between and . */ -+static const long long ada_epoch_offset = (136 * 365 + 44 * 366) * 86400LL; -+struct stat sb; -+if (stat(name, ) != 0) { -+ return LLONG_MIN; -+} -+ -+// return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9 -+// + sb.st_mtim.tv_nsec; -+// with check overflow below -+ -+if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset, )) { -+ return LLONG_MIN; -+} -+ -+if (__builtin_smulll_overflow(result, 1E9, )) { -+ return LLONG_MIN; -+} -+ -+if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, )) { -+ return LLONG_MIN; -+} -+ -+return result; -+ } -+ - #ifdef __cplusplus - } - #endif diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch index a974d18c4144..3decc264638e 100644 --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch @@ -44,249 +44,3 @@ when Copy_Source_Dir => Copy_Source_Directory := new String'(Line (1 .. Last)); a/share/gprconfig/compilers.xml2019-06-01 21:29:57.611722804 +0200 -+++ b/share/gprconfig/compilers.xml2019-06-01 21:42:56.000608601 +0200 -@@ -20,15 +20,15 @@ - - - GCC --(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc -+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d08b24d7f3a424fd78f45ac9f3a34a1605a30eda Author: Alfredo Tupone gentoo org> AuthorDate: Mon Nov 21 07:21:44 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 21 07:22:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08b24d7 dev-ada/gprbuild: fix also stable for change gcc_major_version Closes: https://bugs.gentoo.org/882291 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/{gprbuild-2021-r1.ebuild => gprbuild-2021-r2.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild similarity index 96% rename from dev-ada/gprbuild/gprbuild-2021-r1.ebuild rename to dev-ada/gprbuild/gprbuild-2021-r2.ebuild index c594e0557c65..d4c11ac277e3 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,6 +35,7 @@ src_prepare() { default sed -i \ -e "s:@VER@:${GCC_PV}:g" \ + -e "s:\$gcc_version:${GCC_PV}:g" \ share/gprconfig/compilers.xml \ share/gprconfig/gnat.xml \ share/gprconfig/c.xml \
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 9b6a50314506798fce70a44e8dc22680b1879917 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Nov 20 12:31:15 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 20 12:31:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6a5031 dev-ada/gprbuild: force compiler version Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/{gprbuild-2021-r3.ebuild => gprbuild-2021-r4.ebuild} | 1 + dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild| 1 + 2 files changed, 2 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2021-r3.ebuild b/dev-ada/gprbuild/gprbuild-2021-r4.ebuild similarity index 98% rename from dev-ada/gprbuild/gprbuild-2021-r3.ebuild rename to dev-ada/gprbuild/gprbuild-2021-r4.ebuild index edb506faac96..519b60dab006 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r3.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r4.ebuild @@ -40,6 +40,7 @@ src_prepare() { default sed -i \ -e "s:@VER@:${GCC_PV}:g" \ + -e "s:\$gcc_version:${GCC_PV}:g" \ share/gprconfig/compilers.xml \ share/gprconfig/gnat.xml \ share/gprconfig/c.xml \ diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild index 976bd1e0f713..d221c018a4fe 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild @@ -45,6 +45,7 @@ src_prepare() { default sed -i \ -e "s:@VER@:${GCC_PV}:g" \ + -e "s:\$gcc_version:${GCC_PV}:g" \ share/gprconfig/compilers.xml \ share/gprconfig/gnat.xml \ share/gprconfig/c.xml \
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d3b6fc41e13b1671ee5623278fea689247d3a676 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Sep 16 18:37:43 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Sep 16 18:38:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b6fc41 dev-ada/gprbuild: add gcc_12_2_0 handling Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2021-r3.ebuild | 2 +- dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r3.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild index 3aeaaf969f80..edb506faac96 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r3.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_202{0..1} ) +ADA_COMPAT=( gnat_202{0..1} gcc_12_2_0 ) inherit ada multiprocessing diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild index 63740fc4c7a9..976bd1e0f713 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_202{0,1} ) +ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 ) inherit ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: f0ab2fe76dbbb4a425fcc6885e19e5845c940da3 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Mar 19 22:06:55 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Mar 19 22:06:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ab2fe7 dev-ada/gprbuild: fix NULL DT_RUNPATH Closes: https://bugs.gentoo.org/834701 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-runpath.patch| 11 +++ .../{gprbuild-2021-r2.ebuild => gprbuild-2021-r3.ebuild} | 3 ++- .../{gprbuild-22.0.0-r1.ebuild => gprbuild-22.0.0-r2.ebuild} | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch new file mode 100644 index ..9224a09f9049 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-runpath.patch @@ -0,0 +1,11 @@ +--- a/gpr/src/gpr-util.adb 2022-03-19 22:41:32.372348082 +0100 b/gpr/src/gpr-util.adb 2022-03-19 22:41:54.325010633 +0100 +@@ -3634,7 +3634,7 @@ + end if; + end loop; + +- return Ret; ++ return Ret(1 .. Length - Separator'Length); + end; +end Concat_Paths; + diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild similarity index 96% rename from dev-ada/gprbuild/gprbuild-2021-r2.ebuild rename to dev-ada/gprbuild/gprbuild-2021-r3.ebuild index 8bfc6af4419b..3aeaaf969f80 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch "${FILESDIR}"/${PN}-22.0.0-ar.patch + "${FILESDIR}"/${P}-runpath.patch ) src_prepare() { diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild similarity index 98% rename from dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild rename to dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild index 97506af95abf..63740fc4c7a9 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r2.ebuild @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${PN}-2021-runpath.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: c8c82bae8e84eed2f7692a228e6306febec0e7c5 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Feb 27 09:52:17 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 27 09:52:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c82bae dev-ada/gprbuild: adding compatibility with gnat_2020 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch | 47 +++ dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild| 16 +++- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch new file mode 100644 index ..ba5c2f858de7 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-2020.patch @@ -0,0 +1,47 @@ +--- a/gpr/src/gpr_imports.c2022-02-27 10:10:34.053638209 +0100 b/gpr/src/gpr_imports.c2022-02-27 10:12:03.898276758 +0100 +@@ -114,6 +114,44 @@ + const char *__gnat_default_libgcc_subdir = "lib"; + #endif + ++#include ++#include ++#include ++#include ++ ++ extern long long __gnat_file_time(char* name) ++ { ++long long result; ++ ++if (name == NULL) { ++ return LLONG_MIN; ++} ++/* Number of seconds between and . */ ++static const long long ada_epoch_offset = (136 * 365 + 44 * 366) * 86400LL; ++struct stat sb; ++if (stat(name, ) != 0) { ++ return LLONG_MIN; ++} ++ ++// return (sb.st_mtim.tv_sec - ada_epoch_offset) * 1E9 ++// + sb.st_mtim.tv_nsec; ++// with check overflow below ++ ++if (__builtin_ssubll_overflow(sb.st_mtim.tv_sec, ada_epoch_offset, )) { ++ return LLONG_MIN; ++} ++ ++if (__builtin_smulll_overflow(result, 1E9, )) { ++ return LLONG_MIN; ++} ++ ++if (__builtin_saddll_overflow(result, sb.st_mtim.tv_nsec, )) { ++ return LLONG_MIN; ++} ++ ++return result; ++ } ++ + #ifdef __cplusplus + } + #endif diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild index 06eb16e01235..97506af95abf 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -ADA_COMPAT=( gnat_2021 ) +ADA_COMPAT=( gnat_202{0,1} ) inherit ada multiprocessing @@ -53,6 +53,18 @@ src_prepare() { -e "s:@GNATBIND@:${GNATBIND}:g" \ src/gprlib.adb \ || die + if use ada_target_gnat_2020; then + sed -i \ + -e "s:Append_Vector:Append:g" \ + -e "s:Insert_Vector:Insert:g" \ + src/gprbuild-link.adb \ + src/gprinstall-install.adb \ + src/gprlib.adb \ + src/gprlib-build_shared_lib.adb \ + src/gprbind.adb \ + || die + eapply "${FILESDIR}"/${P}-2020.patch + fi } bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 778901b50d7e1b0f09ff48274db2de8229a1d503 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Dec 23 07:23:25 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Dec 23 07:53:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778901b5 dev-ada/gprbuild: use AR or NM env instead Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 --- dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 5 +++-- dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 5 +++-- dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch | 5 +++-- dev-ada/gprbuild/gprbuild-2021-r2.ebuild| 2 +- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch deleted file mode 100644 index 77f0cfead7ed.. --- a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100 -+++ b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100 -@@ -864,7 +864,7 @@ - - - -- for Archive_Builder use ("ar", "cr"); -+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); -for Archive_Builder_Append_Option use ("q"); -for Archive_Indexer use ("ranlib"); -for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch index 2bf41a8e1b07..9fcab1565857 100644 --- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch +++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch @@ -1,11 +1,12 @@ --- 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 @@ +@@ -128,7 +128,8 @@ - for Object_Lister use ("nm", "-g"); -+ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); ++ NM := External("NM", "nm"); ++ for Object_Lister use (NM, "-g"); for Object_Lister_Matcher use " [TDRB] (.*)"; LDFLAGS := External_As_List ("LDFLAGS", " "); diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch index 452733493ace..6a9513473bf9 100644 --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch @@ -1,11 +1,12 @@ --- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 +++ b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 -@@ -877,7 +877,7 @@ +@@ -877,7 +877,8 @@ - for Archive_Builder use ("ar", "cr"); -+ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); ++ AR := External("AR", "ar"); ++ for Archive_Builder use (AR, "cr"); for Archive_Builder_Append_Option use ("q"); for Archive_Indexer use ("ranlib"); for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch index 4455e8befffa..062d7960fce7 100644 --- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch @@ -1,11 +1,12 @@ --- 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 @@ +@@ -128,7 +128,8 @@ - for Object_Lister use ("nm", "-g"); -+ for Object_Lister use ("${HOST(Ada)}-nm", "-g"); ++ NM := External("NM", "nm"); ++ for Object_Lister use (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 index 405996ac11c4..8bfc6af4419b 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -32,7 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch - "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${PN}-22.0.0-ar.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 2f80ac2e7e03f1ad5c2735cf6a35e015bfeb4180 Author: Alfredo Tupone gentoo org> AuthorDate: Wed Dec 22 21:53:03 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Dec 22 21:53:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f80ac2e dev-ada/gprbuild: use chost-ar Closes: https://bugs.gentoo.org/829701 Closes: https://bugs.gentoo.org/736036 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-ar.patch | 11 +++ dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch | 11 +++ dev-ada/gprbuild/gprbuild-2021-r2.ebuild| 1 + dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild | 1 + 4 files changed, 24 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-ar.patch b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch new file mode 100644 index ..77f0cfead7ed --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-ar.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-22 22:06:14.895471351 +0100 b/share/gprconfig/linker.xml 2021-12-22 22:08:01.050767123 +0100 +@@ -864,7 +864,7 @@ + + + +- for Archive_Builder use ("ar", "cr"); ++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); +for Archive_Builder_Append_Option use ("q"); +for Archive_Indexer use ("ranlib"); +for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch new file mode 100644 index ..452733493ace --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch @@ -0,0 +1,11 @@ +--- a/share/gprconfig/linker.xml 2021-12-22 22:40:42.611766036 +0100 b/share/gprconfig/linker.xml 2021-12-22 22:42:28.839096356 +0100 +@@ -877,7 +877,7 @@ + + + +- for Archive_Builder use ("ar", "cr"); ++ for Archive_Builder use ("${HOST(Ada)}-ar", "cr"); +for Archive_Builder_Append_Option use ("q"); +for Archive_Indexer use ("ranlib"); +for Archive_Suffix use ".a"; diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild index 40a16cb9b2d4..405996ac11c4 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch + "${FILESDIR}"/${P}-ar.patch ) src_prepare() { diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild index 2a07d5e4d71d..06eb16e01235 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild @@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-nm.patch + "${FILESDIR}"/${P}-ar.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: f62537c112bcf92c8e243e06a4b0a109b5c631d1 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Dec 21 21:50:00 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Dec 21 21:50:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62537c1 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 gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-nm.patch | 11 dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch| 11 ...build-22.0.0.ebuild => gprbuild-2021-r2.ebuild} | 33 ++ ...ild-22.0.0.ebuild => gprbuild-22.0.0-r1.ebuild} | 5 +++- 4 files changed, 41 insertions(+), 19 deletions(-) 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 ..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 ..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-22.0.0.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild similarity index 71% copy from dev-ada/gprbuild/gprbuild-22.0.0.ebuild copy to dev-ada/gprbuild/gprbuild-2021-r2.ebuild index 6de6ca467e32..40a16cb9b2d4 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild @@ -3,22 +3,21 @@ EAPI=7 -ADA_COMPAT=( gnat_2021 ) +ADA_COMPAT=( gnat_202{0..1} ) inherit ada multiprocessing -XMLADA=xmlada-${PV} -GPRCONFIG_KB=gprconfig_kb-${PV} +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=" - 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" + ${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" @@ -27,16 +26,15 @@ IUSE="" DEPEND="${ADA_DEPS}" RDEPEND="${DEPEND}" +S="${WORKDIR}"/${MYP} + REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +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" \ @@ -75,8 +73,7 @@ src_install() { exeinto /usr/libexec/gprbuild doexe ${lib_progs} insinto /usr/share/gprconfig - doins share/gprconfig/*.xml - doins share/gprconfig/*.ent + doins share/gprconfig/* 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-r1.ebuild similarity index 96% rename from dev-ada/gprbuild/gprbuild-22.0.0.ebuild rename to dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild index 6de6ca467e32..2a07d5e4d71d 100644 --- a/dev-ada/gprbuild/gprbuild-22.0.0.ebuild +++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild @@ -28,7 +28,10 @@ DEPEND="${ADA_DEPS}" RDEPEND="${DEPEND}" REQUIRED_USE="${ADA_REQUIRED_USE}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-nm.patch +) src_prepare() { kb_src=../${GPRCONFIG_KB}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 3128fb02df351fc7179e6e3ca5b6655a06b2f6d0 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Dec 19 22:08:08 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Dec 19 22:08:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3128fb02 dev-ada/gprbuild: x86 stable wrt bug #800527 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-ada/gprbuild/gprbuild-2021-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 37e819ad2623..c594e0557c65 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" ${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: db83afa7a333708cc8c0a5e3982ac131aa13f204 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Nov 25 07:34:38 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Nov 25 07:34:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db83afa7 dev-ada/gprbuild: unsupport gnat_2019, drop old Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 286 -- dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 76 -- dev-ada/gprbuild/gprbuild-2020.ebuild | 76 -- 4 files changed, 440 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 7f29364e5a67..adc6ed460a2d 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,7 +1,5 @@ -DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 -DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch deleted file mode 100644 index 9e6040b8ddc9.. --- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch +++ /dev/null @@ -1,286 +0,0 @@ a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 -+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 -@@ -266,7 +266,9 @@ - -Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - -Compiler_Name : String_Access := new String'("gcc"); - -@@ -2081,7 +2083,7 @@ - and then Line (Last - 2 .. Last) = "gcc" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 3) & "objcopy"); - -@@ -2089,7 +2091,7 @@ - and then Line (Last - 6 .. Last) = "gcc.exe" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 7) & "objcopy"); - end if; -@@ -2241,7 +2243,13 @@ -Mapping_File_Name := new String'(Line (1 ..
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: cccdcdc5666eaacbc64bdc824be3739847f7ae8f Author: Alfredo Tupone gentoo org> AuthorDate: Sat Nov 13 08:35:21 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Nov 13 08:35:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cccdcdc5 dev-ada/gprbuild: 22.0.0 bump Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 3 + .../gprbuild/files/gprbuild-22.0.0-gentoo.patch| 292 + dev-ada/gprbuild/gprbuild-22.0.0.ebuild| 83 ++ dev-ada/gprbuild/metadata.xml | 3 + 4 files changed, 381 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index b5542ae5b4d..7f29364e5a6 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,7 @@ DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 +DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a +DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 +DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch new file mode 100644 index 000..a974d18c414 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-gentoo.patch @@ -0,0 +1,292 @@ +--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 +@@ -266,7 +266,9 @@ + +Driver_Name : Name_Id := No_Name; + +- Gnatbind_Name : String_Access := new String'("gnatbind"); ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); ++ ++ Gnatbind_Path_Option : constant String := "--gnatbind_path="; + +Compiler_Name : String_Access := new String'("gcc"); + +@@ -2081,7 +2083,7 @@ + and then Line (Last - 2 .. Last) = "gcc" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 3) & "gnatbind"); ++ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 3) & "objcopy"); + +@@ -2089,7 +2091,7 @@ + and then Line (Last - 6 .. Last) = "gcc.exe" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 7) & "gnatbind"); ++ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 7) & "objcopy"); + end if; +@@ -2241,7 +2243,13 @@ +Mapping_File_Name := new String'(Line (1 .. Last)); + +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: e7f11a63cb1188fd1e961ab4faaf5d7ec08a44a7 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Sep 19 13:10:06 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Sep 19 13:10:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f11a63 dev-ada/gprbuild: drop gentoo.org> dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2020.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild index 55116e70ff6..0a8c906e76a 100644 --- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_201{7..9} gnat_2020 ) +ADA_COMPAT=( gnat_2019 gnat_2020 ) inherit ada multiprocessing diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index 09a4684b639..8b3fd0402cc 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_201{7,8,9} ) +ADA_COMPAT=( gnat_2019 ) inherit ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 7da9f2e16daf35eaf121fb86a2418735cbc65d5b Author: Alfredo Tupone gentoo org> AuthorDate: Wed Sep 15 19:36:33 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Sep 15 19:36:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da9f2e1 dev-ada/gprbuild: UnusedInherits Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2020.ebuild| 2 +- dev-ada/gprbuild/gprbuild-2021-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild index d3ee4019b22..55116e70ff6 100644 --- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 ADA_COMPAT=( gnat_201{7..9} gnat_2020 ) -inherit ada toolchain-funcs multiprocessing +inherit ada multiprocessing MYP=${P}-20200429-19BD2-src XMLADA=xmlada-${PV}-20200429-19A99-src diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index dd6ac51b2fa..09a4684b639 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -5,7 +5,7 @@ EAPI=7 ADA_COMPAT=( gnat_201{7,8,9} ) -inherit ada toolchain-funcs multiprocessing +inherit ada multiprocessing MYP=${P}-20200429-19BD2-src XMLADA=xmlada-${PV}-20200429-19A99-src diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 9fae54f90be..37e819ad262 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 ADA_COMPAT=( gnat_202{0..1} ) -inherit ada toolchain-funcs multiprocessing +inherit ada multiprocessing MYP=${P}-${PV}0519-19A34-src ID=23a77a37247ff811609e23a0a271f445c299fc8f
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: b17dead2746fce0221c964e7acf92f5535ce09fd Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jul 20 06:33:38 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jul 20 06:33:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17dead2 dev-ada/gprbuild: amd64 stable wrt bug #800527 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-ada/gprbuild/gprbuild-2021-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 47c4d46d14f..9fae54f90be 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" ${ADAMIRROR}/${XMLADAID}?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="${ADA_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: bc872e0005084c5c0262d239efc504a2b75c16fd Author: Alfredo Tupone gentoo org> AuthorDate: Sat Jun 5 13:30:42 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jun 5 13:30:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc872e00 dev-ada/gprbuild: drop gnat_2016 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2017-config.patch | 122 -- dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 94 - dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 85 --- 4 files changed, 303 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index b1f5e6eda06..b5542ae5b4d 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,6 +1,4 @@ DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 -DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 -DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch deleted file mode 100644 index 5dcd58ffb21..000 --- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch +++ /dev/null @@ -1,122 +0,0 @@ a/share/gprconfig/compilers.xml2018-10-27 09:04:53.830077299 +0200 -+++ b/share/gprconfig/compilers.xml2018-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
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 20a6f1df78e06c9f508e4f31c36f57b5af4684da Author: Alfredo Tupone gentoo org> AuthorDate: Wed Jun 2 11:38:26 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Jun 2 11:38:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a6f1df dev-ada/gprbuild: use ADAMIRROR & ID Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2021-r1.ebuild | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild index 02f4c0558a5..47c4d46d14f 100644 --- a/dev-ada/gprbuild/gprbuild-2021-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild @@ -8,15 +8,16 @@ ADA_COMPAT=( gnat_202{0..1} ) inherit ada toolchain-funcs 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=" - https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=${MYP}.tar.gz - -> ${MYP}.tar.gz - https://community.download.adacore.com/v1/6a2cf72f308cc787926b12ddc20993fcf2b8ea79?filename=${XMLADA}.tar.gz - -> ${XMLADA}.tar.gz" + ${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"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 684579cabe8b97ec395650d1ec892b9ad9796dd2 Author: Alfredo Tupone gentoo org> AuthorDate: Mon May 31 08:42:20 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon May 31 08:42:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684579ca dev-ada/gprbuild: fix gnat discovery Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 8 +++- .../gprbuild/{gprbuild-2021.ebuild => gprbuild-2021-r1.ebuild}| 0 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch index ac61f561785..15264d6828e 100644 --- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch @@ -65,7 +65,7 @@ -@@ -185,9 +185,9 @@ +@@ -185,14 +185,14 @@ --> GNAT @@ -77,6 +77,12 @@ Ada + +- ${PREFIX}gcc -v ++ ${PREFIX}gcc-@VER@ -v + + + @@ -202,68 +202,11 @@ \.\./$TARGET/lib/gnat/(.*)/adalib/ diff --git a/dev-ada/gprbuild/gprbuild-2021.ebuild b/dev-ada/gprbuild/gprbuild-2021-r1.ebuild similarity index 100% rename from dev-ada/gprbuild/gprbuild-2021.ebuild rename to dev-ada/gprbuild/gprbuild-2021-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: ae86b692a753c84529aa35c07f435a2621cb9128 Author: Alfredo Tupone gentoo org> AuthorDate: Sun May 30 13:54:21 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun May 30 13:54:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae86b692 dev-ada/gprbuild: bump to 2021 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch | 286 ++ dev-ada/gprbuild/gprbuild-2021.ebuild | 76 ++ 3 files changed, 364 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 3ee032d60e9..b1f5e6eda06 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,6 @@ DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd +DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8 DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c +DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch new file mode 100644 index 000..ac61f561785 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch @@ -0,0 +1,286 @@ +--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 +@@ -266,7 +266,9 @@ + +Driver_Name : Name_Id := No_Name; + +- Gnatbind_Name : String_Access := new String'("gnatbind"); ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); ++ ++ Gnatbind_Path_Option : constant String := "--gnatbind_path="; + +Compiler_Name : String_Access := new String'("gcc"); + +@@ -2081,7 +2083,7 @@ + and then Line (Last - 2 .. Last) = "gcc" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 3) & "gnatbind"); ++ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 3) & "objcopy"); + +@@ -2089,7 +2091,7 @@ + and then Line (Last - 6 .. Last) = "gcc.exe" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 7) & "gnatbind"); ++ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 7) & "objcopy"); + end if; +@@ -2241,7 +2243,13 @@ +Mapping_File_Name := new String'(Line (1 .. Last)); + + when Binding_Options => +- Binding_Options_Table.Append (Line (1 .. Last)); ++ if Last > Gnatbind_Path_Option'Length ++ and then Line (1 .. Gnatbind_Path_Option'Length) = ++ Gnatbind_Path_Option then ++ null; ++ else ++ Binding_Options_Table.Append
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: f852753f1afc2d3286bfa4699e3493c99a384f5f Author: Alfredo Tupone gentoo org> AuthorDate: Fri May 14 18:30:40 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri May 14 18:32:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f852753f dev-ada/gprbuild: fix VariableScope for 2020 version Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 10 +++--- dev-ada/gprbuild/gprbuild-2020-r1.ebuild | 4 dev-ada/gprbuild/gprbuild-2020.ebuild| 6 +- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild index 8e9afef371c..4b54ddf9978 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -54,10 +54,6 @@ src_prepare() { fi } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" @@ -69,11 +65,11 @@ src_compile() { 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 + -o ${bin} -largs ${LDFLAGS} gpr_imports.o || die done for lib in $lib_progs; do gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ - -largs gpr_imports.o || die + -largs ${LDFLAGS} gpr_imports.o || die done } diff --git a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild index d95789381b9..d3ee4019b22 100644 --- a/dev-ada/gprbuild/gprbuild-2020-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020-r1.ebuild @@ -45,10 +45,6 @@ src_prepare() { || die } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index 9d14bd49683..dd6ac51b2fa 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,10 +45,6 @@ src_prepare() { || die } -src_configure() { - emake prefix="${D}"/usr setup -} - bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 5b53b3aeda670af51207cb04b9fe5ca4c9c430e3 Author: Alfredo Tupone gentoo org> AuthorDate: Wed May 12 19:00:38 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed May 12 19:00:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b53b3ae dev-ada/gprbuild: support gnat_2020 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch | 274 - ...uild-2019-r1.ebuild => gprbuild-2020-r1.ebuild} | 18 +- 3 files changed, 9 insertions(+), 285 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index f7e381e3e4e..3ee032d60e9 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,6 +1,4 @@ -DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 -DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch deleted file mode 100644 index 352ff033b81..000 --- a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch +++ /dev/null @@ -1,274 +0,0 @@ a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 -+++ b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 -@@ -266,7 +266,9 @@ - -Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); -+ -+ Gnatbind_Path_Option : constant String := "--gnatbind_path="; - -Compiler_Name : String_Access := new String'("gcc"); - -@@ -2081,7 +2083,7 @@ - and then Line (Last - 2 .. Last) = "gcc" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 3) & "gnatbind"); -+ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 3) & "objcopy"); - -@@ -2089,7 +2091,7 @@ - and then Line (Last - 6 .. Last) = "gcc.exe" - then -Gnatbind_Name := -- new String'(Line (1 .. Last - 7) & "gnatbind"); -+ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); -Objcopy_Name := - new String'(Line (1 .. Last - 7) & "objcopy"); - end if; -@@ -2241,7 +2243,13 @@ -Mapping_File_Name := new String'(Line (1 .. Last)); - - when Binding_Options => -- Binding_Options_Table.Append (Line (1 .. Last)); -+ if Last > Gnatbind_Path_Option'Length -+ and then Line (1 .. Gnatbind_Path_Option'Length) = -+ Gnatbind_Path_Option then -+ null; -+ else -+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 0cde846253f4ad059fb28b788a9f7527f3c8f3f6 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Aug 1 20:34:23 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Aug 1 20:34:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde8462 dev-ada/gprbuild: 2020 stable Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2020.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index c633f202b55..9d14bd49683 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -19,7 +19,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 9077b09fc51cd1513ba6aa70675e59365c2f24cd Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jun 16 20:29:23 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 16 20:29:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9077b09f dev-ada/gprbuild: use LDFLAGS to build ada libraries Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 12 1 file changed, 12 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch index 66ec4f7f0dd..9e6040b8ddc 100644 --- a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch @@ -272,3 +272,15 @@ +--- a/share/gprconfig/linker.xml 2020-06-16 22:13:38.508782578 +0200 b/share/gprconfig/linker.xml 2020-06-16 22:14:32.693966110 +0200 +@@ -112,6 +112,9 @@ +for Object_Lister use ("nm", "-g"); +for Object_Lister_Matcher use " [TDRB] (.*)"; + ++ LDFLAGS := External_As_List ("LDFLAGS", " "); ++ for Leading_Library_Options use LDFLAGS; ++ +package Linker is + for Export_File_Format use "GNU"; + for Export_File_Switch use "-Wl,--version-script=";
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 7769b261c8be306a5455a84eafc6e8fac9851f67 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Jun 11 21:04:23 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Jun 11 21:04:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7769b261 dev-ada/gprbuild: fix source name Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 +- dev-ada/gprbuild/gprbuild-2020.ebuild | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index ed748ce42b2..f7e381e3e4e 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,5 +1,5 @@ -DIST 408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b +DIST gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c diff --git a/dev-ada/gprbuild/gprbuild-2020.ebuild b/dev-ada/gprbuild/gprbuild-2020.ebuild index fa4ded0b7f3..c633f202b55 100644 --- a/dev-ada/gprbuild/gprbuild-2020.ebuild +++ b/dev-ada/gprbuild/gprbuild-2020.ebuild @@ -14,6 +14,7 @@ DESCRIPTION="Multi-Language Management" HOMEPAGE="http://libre.adacore.com/; SRC_URI=" https://community.download.adacore.com/v1/408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=${MYP}.tar.gz + -> ${MYP}.tar.gz https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=${XMLADA}.tar.gz -> ${XMLADA}.tar.gz" LICENSE="GPL-3"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 81d8a41b6692c82b5b46b05e817c8a741bdb1318 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jun 9 11:36:38 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 9 11:36:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d8a41b dev-ada/gprbuild: version bump to 2020 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch | 274 ++ dev-ada/gprbuild/gprbuild-2020.ebuild | 79 +++ 3 files changed, 355 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 492408c6c4b..ed748ce42b2 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,6 @@ +DIST 408ec35c3bb86bd227db3da55d3e1e0c572a56e3?filename=gprbuild-2020-20200429-19BD2-src.tar.gz 2489399 BLAKE2B 3a036cb40bbe5522af63c376a672384093901b44df6fd74013f1eff9d269c2f5056224ab5e7d59b6f3cf126cd14dd30420056b09e887851351462de59f700e3a SHA512 d2ff6a5d8281d332a31533c7a5744b6169fd250c9086373fd658486c1e529564d9830b9ef3b2dfcbec5f8c1ba50d244a9eb45bf8fdccd53f8b711dcf29258dfd DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 +DIST xmlada-2020-20200429-19A99-src.tar.gz 1533111 BLAKE2B e2c25e103c5c560cf7c9580118580e2952f3ef56c244b0f76c7f484e5629b684d5ee546d2d40520e1a4bf963271d360522423f4e7d81570f7dc1dbc8424c9147 SHA512 e53dd1fba504d2aa91ce29ea381c62adea12c5d8c72cd87396b903143279456cc6547c18035f6e988e95bd93607360075789532378f33cbe23bef9b49c8d984c DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch new file mode 100644 index 000..66ec4f7f0dd --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2020-gentoo.patch @@ -0,0 +1,274 @@ +--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 +@@ -266,7 +266,9 @@ + +Driver_Name : Name_Id := No_Name; + +- Gnatbind_Name : String_Access := new String'("gnatbind"); ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); ++ ++ Gnatbind_Path_Option : constant String := "--gnatbind_path="; + +Compiler_Name : String_Access := new String'("gcc"); + +@@ -2081,7 +2083,7 @@ + and then Line (Last - 2 .. Last) = "gcc" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 3) & "gnatbind"); ++ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 3) & "objcopy"); + +@@ -2089,7 +2091,7 @@ + and then Line (Last - 6 .. Last) = "gcc.exe" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 7) & "gnatbind"); ++ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 7) & "objcopy"); + end if; +@@ -2241,7 +2243,13 @@ +Mapping_File_Name := new String'(Line (1 .. Last)); + + when Binding_Options => +- Binding_Options_Table.Append (Line (1 .. Last)); ++ if Last > Gnatbind_Path_Option'Length ++ and then Line (1 .. Gnatbind_Path_Option'Length) = ++ Gnatbind_Path_Option then ++ null; ++
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: f867ce08546d1c85a62ea1e167de8161b1d2c0a9 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Dec 4 21:27:18 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Dec 4 21:27:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f867ce08 dev-ada/gprbuild: remove old versions Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 95 dev-ada/gprbuild/gprbuild-2019.ebuild| 89 -- 2 files changed, 184 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild deleted file mode 100644 index d279f478a5e..000 --- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild +++ /dev/null @@ -1,95 +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/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 - if use gnat_2016; then - sed -i \ - -e 's:"-no-pie", ::g' \ - share/gprconfig/linker.xml \ - || die - fi -} - -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 -} diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild deleted file mode 100644 index 59749d8d9a7..000 --- a/dev-ada/gprbuild/gprbuild-2019.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multiprocessing - -MYP=${P}-20190517-194D8-src -XMLADA=xmlada-${PV}-20190429-19B9D-src - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/; -SRC_URI=" - http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 - -> ${MYP}.tar.gz - http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 - -> ${XMLADA}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2017 gnat_2018 +gnat_2019" - -DEPEND="gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) - gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MYP} - -REQUIRED_USE="^^ ( gnat_2017 gnat_2018 gnat_2019 )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - if use gnat_2017; then - GCC_PV=6.3.0 - elif use gnat_2018; then - GCC_PV=7.3.1 - else - GCC_PV=8.3.1 -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: c9d406cbb798e9410cda68bdf842f8919d1c28b5 Author: Tupone Alfredo gentoo org> AuthorDate: Fri Oct 18 06:33:29 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 18 06:33:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d406cb dev-ada/gprbuild: stable Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2019-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild index dc676658391..8e9afef371c 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}" diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild index f5ef22a5442..edba878042c 100644 --- a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="${ADA_DEPS}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 709682396918812d6983fd73740adf30c89be136 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Sep 18 09:18:07 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Sep 18 09:26:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70968239 dev-ada/gprbuild: use wrapper for gcc and gnatmake Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 6 +++--- dev-ada/gprbuild/gprbuild-2019-r1.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild index 4f38907463f..dc676658391 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -66,13 +66,13 @@ src_compile() { 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 + 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 \ + 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 \ + gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ -largs gpr_imports.o || die done } diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild index 025a4ab8e39..f5ef22a5442 100644 --- a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild @@ -57,13 +57,13 @@ src_compile() { 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 + 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 \ + 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 \ + gnatmake -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ -largs gpr_imports.o || die done }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 415c011ebbe5ae8d85431639567c3ae3e9862800 Author: Tupone Alfredo gentoo org> AuthorDate: Thu Sep 12 12:42:58 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Sep 12 12:42:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415c011e dev-ada/gprbuild: simplify using ada eclass Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 89 dev-ada/gprbuild/gprbuild-2019-r1.ebuild | 80 2 files changed, 169 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild new file mode 100644 index 000..4f38907463f --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_201{6,7} ) + +inherit ada 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="" + +DEPEND="${ADA_DEPS}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +REQUIRED_USE="${ADA_REQUIRED_USE}" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-config.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 + if use ada_target_gnat_2016; then + sed -i \ + -e 's:"-no-pie", ::g' \ + share/gprconfig/linker.xml \ + || die + fi +} + +src_configure() { + emake prefix="${D}"/usr setup +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + 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 +} diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild new file mode 100644 index 000..025a4ab8e39 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_201{7,8,9} ) + +inherit ada toolchain-funcs multiprocessing + +MYP=${P}-20190517-194D8-src +XMLADA=xmlada-${PV}-20190429-19B9D-src + +DESCRIPTION="Multi-Language Management" +HOMEPAGE="http://libre.adacore.com/; +SRC_URI=" + http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 + -> ${MYP}.tar.gz + http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 + -> ${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 ) + +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 +} + +src_configure() { + emake prefix="${D}"/usr setup +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 5286b4f6cd79dc7a1797daa9109d06ae5c2c9331 Author: Tupone Alfredo gentoo org> AuthorDate: Thu Sep 5 06:11:30 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Sep 5 06:11:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5286b4f6 dev-ada/gprbuild: using ada eclass Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2017-r2.ebuild | 89 dev-ada/gprbuild/gprbuild-2019-r1.ebuild | 81 + 2 files changed, 170 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2017-r2.ebuild b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild new file mode 100644 index 000..79897043cf6 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2017-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_201{6,7} ) + +inherit ada 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="" + +REQUIRED_USE="${ADA_REQUIRED_USE}" + +DEPEND="${ADA_DEPS}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-config.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 + if use ada_target_gnat_2016; then + sed -i \ + -e 's:"-no-pie", ::g' \ + share/gprconfig/linker.xml \ + || die + fi +} + +src_configure() { + emake prefix="${D}"/usr setup +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + 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 +} diff --git a/dev-ada/gprbuild/gprbuild-2019-r1.ebuild b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild new file mode 100644 index 000..14f410a45c1 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2019-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ADA_COMPAT=( gnat_201{7,8,9} ) + +inherit ada toolchain-funcs multiprocessing + +MYP=${P}-20190517-194D8-src +XMLADA=xmlada-${PV}-20190429-19B9D-src + +DESCRIPTION="Multi-Language Management" +HOMEPAGE="http://libre.adacore.com/; +SRC_URI=" + http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093 + -> ${MYP}.tar.gz + http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5 + -> ${XMLADA}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +REQUIRED_USE="${ADA_REQUIRED_USE}" + +DEPEND="${ADA_DEPS}" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP} + +PATCHES=( "${FILESDIR}"/${P}-gentoo.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 +} + +src_configure() { + emake prefix="${D}"/usr setup +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 66c86278b6d3667532d4a1c8a99b842b99d940ec Author: Tupone Alfredo gentoo org> AuthorDate: Tue Aug 27 07:03:32 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Aug 27 07:03:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c86278 dev-ada/gprbuild: remove unused version Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 284 -- dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 86 --- dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 89 --- 4 files changed, 461 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 06e3942bc69..492408c6c4b 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,6 +1,4 @@ DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 -DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 -DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch deleted file mode 100644 index 34936ea1f52..000 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ /dev/null @@ -1,284 +0,0 @@ a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200 -+++ b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 -@@ -67,6 +67,7 @@ - for Switches ("gpr*.ad?") use - Compiler'Default_Switches ("Ada") & ("-g1"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); -end Compiler; - - end GPR; a/gpr/src/gpr-names.ads2017-11-19 13:09:18.947527738 +0100 -+++ b/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 -@@ -27,6 +27,8 @@ -Name_Buffer : String (1 .. 1_000_000); -Name_Len: Natural := 0; - -+ Last_Id : Name_Id := Name_Id'First; -+ -procedure Get_Name_String (Id : Name_Id); -procedure Get_Name_String (Id : Unit_Name_Type); -procedure Get_Name_String (Id : File_Name_Type); a/gpr/src/gpr-names.adb2017-11-19 13:10:27.674316703 +0100 -+++ b/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 -@@ -354,6 +354,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; -end Name_Enter; - -@@ -427,6 +429,8 @@ - - Name_Chars.Append (ASCII.NUL); - -+ Last_Id := Name_Entries.Last; -+ - return Name_Entries.Last; -end Name_Find; - a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 -+++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 -@@ -53,6 +53,10 @@ - return; - end if; - -+ if Last_Id = Name_Id'First then -+ Add_Name (""); -+ end if; -+ - Add_Name ("a"); - Add_Name ("b"); - Add_Name ("c"); a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100 -+++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 -@@ -263,7 +263,9 @@ - -Driver_Name : Name_Id := No_Name; - -- Gnatbind_Name : String_Access := new String'("gnatbind"); -+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 1648d59ccb63f921e09fc7758ede6774b9f66741 Author: David Seifert gentoo org> AuthorDate: Sun Aug 11 11:19:24 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 11 11:19:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1648d59c dev-ada/gprbuild: [QA] Fix missing trailing slash Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> dev-ada/gprbuild/gprbuild-2019.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild index 6154806b069..59749d8d9a7 100644 --- a/dev-ada/gprbuild/gprbuild-2019.ebuild +++ b/dev-ada/gprbuild/gprbuild-2019.ebuild @@ -53,7 +53,7 @@ src_prepare() { } src_configure() { - emake prefix="${D}"usr setup + emake prefix="${D}"/usr setup } bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: a8224d4f4537bda2ee94b3a5dd0828d0ab4faf1a Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jul 27 18:29:48 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jul 27 18:29:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8224d4f dev-ada/gprbuild: stable Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2019.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild index 2b14a7c3d2a..de11e09704d 100644 --- a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild @@ -16,7 +16,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gnat_2019" DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild index 48221ce5813..6154806b069 100644 --- a/dev-ada/gprbuild/gprbuild-2019.ebuild +++ b/dev-ada/gprbuild/gprbuild-2019.ebuild @@ -17,7 +17,7 @@ SRC_URI=" -> ${XMLADA}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2017 gnat_2018 +gnat_2019" DEPEND="gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: c82fd9c6818a21f655ad731a1633d0f5b320f1ca Author: Tupone Alfredo gentoo org> AuthorDate: Fri Jun 21 06:12:17 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jun 21 06:16:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82fd9c6 dev-ada/gprbuild: maintainer -> ada Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/gprbuild/metadata.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml index 655a849b520..505e6ca37ea 100644 --- a/dev-ada/gprbuild/metadata.xml +++ b/dev-ada/gprbuild/metadata.xml @@ -1,9 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - tup...@gentoo.org - Tupone Alfredo + + a...@gentoo.org Compile with dev-lang/gnat-gpl-2016
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d3e930d41e9720059c8be29bb69be0d0c40e Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 3 17:21:02 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 3 17:21:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e930d4 dev-ada/gprbuild: EAPI 7 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/gprbuild/gprbuild-2019.ebuild | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2019.ebuild b/dev-ada/gprbuild/gprbuild-2019.ebuild index 7afdf9a67bf..48221ce5813 100644 --- a/dev-ada/gprbuild/gprbuild-2019.ebuild +++ b/dev-ada/gprbuild/gprbuild-2019.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs multiprocessing @@ -18,17 +18,16 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gnat_2016 gnat_2017 gnat_2018 +gnat_2019" +IUSE="gnat_2017 gnat_2018 +gnat_2019" -DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) +DEPEND="gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP} -REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )" +REQUIRED_USE="^^ ( gnat_2017 gnat_2018 gnat_2019 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 0f1f8f502c96495a9abe50a6edf0ab07924125a6 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Jun 2 16:50:56 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jun 2 16:50:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f1f8f50 dev-ada/gprbuild: New (2019) version Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch | 274 ++ dev-ada/gprbuild/gprbuild-2019.ebuild | 90 +++ 3 files changed, 366 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 75d4210b6e2..06e3942bc69 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,6 @@ +DIST gprbuild-2019-20190517-194D8-src.tar.gz 2507961 BLAKE2B 0f70d94cb0db9ddc1dd308862aaa305a91965a62a936cfbdde2ae9f3f735f0cc3d69596b09da4b979a1d7923087ab0ec5cf2d6541551f057b5e8e0c499065a90 SHA512 0388d7e6cdf625fef40b33da764091b3283dd88714c64ecfad4b5e99253f183b1a9b717c19281e6d45cc4277a05fadb2e2ace394d6f30638664b66c97123052b DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 +DIST xmlada-2019-20190429-19B9D-src.tar.gz 1582603 BLAKE2B e2be3e7c0c8b843bfc808a3dd726235a82588caed8c919975a97ce34c72d6d634361bbc34208590210936add9e2f881b59d01168ef79abed1e489c50b27094d8 SHA512 f8e0e25b0aee9a7a18223ae7761603082af55134f062c767d0cd0dbf0dbcb2058fc7c57532b567fb2c6efa464a53ead57b300578e98962025866e5c3ad73e380 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 diff --git a/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch new file mode 100644 index 000..352ff033b81 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2019-gentoo.patch @@ -0,0 +1,274 @@ +--- a/src/gprlib.adb 2019-06-02 10:57:49.807002425 +0200 b/src/gprlib.adb 2019-06-02 11:01:32.986518447 +0200 +@@ -266,7 +266,9 @@ + +Driver_Name : Name_Id := No_Name; + +- Gnatbind_Name : String_Access := new String'("gnatbind"); ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); ++ ++ Gnatbind_Path_Option : constant String := "--gnatbind_path="; + +Compiler_Name : String_Access := new String'("gcc"); + +@@ -2081,7 +2083,7 @@ + and then Line (Last - 2 .. Last) = "gcc" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 3) & "gnatbind"); ++ new String'(Line (1 .. Last - 3) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 3) & "objcopy"); + +@@ -2089,7 +2091,7 @@ + and then Line (Last - 6 .. Last) = "gcc.exe" + then +Gnatbind_Name := +- new String'(Line (1 .. Last - 7) & "gnatbind"); ++ new String'(Line (1 .. Last - 7) & "@GNATBIND@"); +Objcopy_Name := + new String'(Line (1 .. Last - 7) & "objcopy"); + end if; +@@ -2241,7 +2243,13 @@ +Mapping_File_Name := new String'(Line (1 .. Last)); + + when Binding_Options => +- Binding_Options_Table.Append (Line (1 .. Last)); ++ if Last > Gnatbind_Path_Option'Length ++ and then Line (1 .. Gnatbind_Path_Option'Length) = ++ Gnatbind_Path_Option then ++ null; ++ else ++ Binding_Options_Table.Append (Line (1 ..
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 255116e954adbb1d82024199c8f491b1f4bafa94 Author: Tupone Alfredo gentoo org> AuthorDate: Thu May 30 06:58:57 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu May 30 06:58:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255116e9 dev-ada/gprbuild: Enable compilation with gnat-gpl-2019 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-ada/gprbuild/gprbuild-2018-r4.ebuild | 89 dev-ada/gprbuild/metadata.xml| 1 + 2 files changed, 90 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2018-r4.ebuild b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild new file mode 100644 index 000..2b14a7c3d2a --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2018-r4.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2019 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 gnat_2019" + +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 ) + gnat_2019? ( dev-lang/gnat-gpl:8.3.1 )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 gnat_2019 )" +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_prepare() { + if use gnat_2017; then + GCC_PV=6.3.0 + elif use gnat_2018; then + GCC_PV=7.3.1 + else + GCC_PV=8.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 +} + +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 +} diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml index 5a1bc58bccd..655a849b520 100644 --- a/dev-ada/gprbuild/metadata.xml +++ b/dev-ada/gprbuild/metadata.xml @@ -9,6 +9,7 @@ Compile with dev-lang/gnat-gpl-2016 Compile with dev-lang/gnat-gpl-2017 Compile with dev-lang/gnat-gpl-2018 + Compile with dev-lang/gnat-gpl-2019 GPRbuild is an advanced software tool designed to help automate the
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 473ba9da56f59fc0bb59045d51629d14dd0c00b8 Author: Tupone Alfredo gentoo org> AuthorDate: Fri Nov 30 19:31:00 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Nov 30 19:31:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473ba9da dev-ada/gprbuild: add -no-pie Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 11 ++- dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 9 + 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index 1f967b61d4c..34936ea1f52 100644 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -264,12 +264,21 @@ --- a/share/gprconfig/linker.xml 2018-10-17 21:36:15.856883517 +0200 +++ b/share/gprconfig/linker.xml 2018-10-17 21:35:15.985896804 +0200 +@@ -1025,7 +1025,7 @@ + + +for Library_Partial_Linker use +- ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); + + + @@ -1044,7 +1044,7 @@ for Library_Partial_Linker use - ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); ++ ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); diff --git a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild index 719ce8ae472..a1157f5c370 100644 --- a/dev-ada/gprbuild/gprbuild-2018-r3.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018-r3.ebuild @@ -30,9 +30,7 @@ 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 + if use gnat_2017; then GCC_PV=6.3.0 else GCC_PV=7.3.1 @@ -49,10 +47,6 @@ src_prepare() { -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() { @@ -88,6 +82,5 @@ src_install() { doins share/gprconfig/* insinto /usr/share/gpr doins share/_default.gpr - insinto /usr/share/gprconfig einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: b851df513cc39a2268329423365e48bddcb758e0 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Nov 26 20:55:48 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 26 20:55:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b851df51 dev-ada/gprbuild: Fix build with -Wl,-r Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2017-config.patch | 4 ++-- dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 6 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch index cb37dd58dd2..5dcd58ffb21 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch @@ -107,7 +107,7 @@ null; when others => - for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); end case; @@ -116,7 +116,7 @@ - for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); -+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o"); diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild index df5101ac4bf..d279f478a5e 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild @@ -50,6 +50,12 @@ src_prepare() { -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \ src/gprlib.adb \ || die + if use gnat_2016; then + sed -i \ + -e 's:"-no-pie", ::g' \ + share/gprconfig/linker.xml \ + || die + fi } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 33ee6ad467f517fb273a3facb3321a06a1c185d8 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Nov 21 21:06:12 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 21 21:06:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ee6ad4 dev-ada/gprbuild: Fix linker file Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2017-config.patch | 25 +++ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch index 72f1fd829c1..cb37dd58dd2 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch @@ -102,12 +102,21 @@ --- 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"); +@@ -814,7 +814,7 @@ + when "arm-android" | "arm-linux-androideabi" => + null; + when others => +- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); +end case; + + +@@ -830,7 +830,7 @@ + + + +- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o"); ++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o"); + + -package Linker is - for Max_Command_Line_Length use "5000";
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 7a7f23ac779030145a23fa786c43f0b0790f5879 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Nov 7 19:53:26 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 7 19:53:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a7f23ac dev-ada/gprbuild: Stabilize and remove old Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2017.xml | 85 dev-ada/gprbuild/gprbuild-2017-r1.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2017.ebuild| 81 -- dev-ada/gprbuild/gprbuild-2018-r3.ebuild | 2 +- 4 files changed, 2 insertions(+), 168 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml b/dev-ada/gprbuild/files/gprbuild-2017.xml deleted file mode 100644 index 9e1e47b512e..000 --- a/dev-ada/gprbuild/files/gprbuild-2017.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - -GNAT-@VER@ -gnatls-@VER@ - - ${PREFIX}gnatls-@VER@ -v --version - - -Ada - - ${PREFIX}gcc-@VER@ -v - - - - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - - ${PREFIX}gcc-@VER@ -dumpmachine - - - - - - - - - - package Compiler is - 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 - ("-c", "-x", "ada", "-gnatA") - Compiler'Leading_Required_Switches ("Ada"); - for Mapping_File_Switches("Ada") use ("-gnatem="); - for Mapping_Spec_Suffix ("Ada") use "%s"; - for Mapping_Body_Suffix ("Ada") use "%b"; - for Config_File_Switches ("Ada") use ("-gnatec="); - for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; - for Multi_Unit_Switches ("Ada") use ("-gnateI"); - for Multi_Unit_Object_Separator ("Ada") use "~"; - for Config_Body_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; - for Config_Spec_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; - for Config_Body_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; - for Config_Spec_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; - for Config_Body_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " - " (Body_File_Name => ""*%b""," - " Casing => %c," - " Dot_Replacement => ""%d"");"; - for Config_Spec_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " - " (Spec_File_Name => ""*%s""," - " Casing => %c," - " Dot_Replacement => ""%d"");"; - for Config_File_Unique("Ada") use "False"; - for PIC_Option ("Ada") use ("-fPIC"); - for Leading_Required_Switches ("Ada") use -Compiler'Leading_Required_Switches ("Ada") ("--RTS=${RUNTIME_DIR(ada)}"); - end Compiler; - - package Binder is - 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)}"; - -for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; - for Library_Encapsulated_Supported use "true"; - - - diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild index 1f443284e87..df5101ac4bf 100644 --- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017 gnat_2018" DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild deleted file mode 100644 index a8b5614d423..000 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: e7d7485e2922d66450f2cecbc8967f81f168646b Author: Tupone Alfredo gentoo org> AuthorDate: Sat Oct 27 20:27:04 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Oct 27 20:27:04 2018 + 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 000..72f1fd829c1 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch @@ -0,0 +1,113 @@ +--- a/share/gprconfig/compilers.xml2018-10-27 09:04:53.830077299 +0200 b/share/gprconfig/compilers.xml2018-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 @@ +_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.xml2018-10-27 09:42:01.327035277 +0200 b/share/gprconfig/c.xml2018-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
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 1340f40143dcafb4f0d64de0fb7b58de01a892f5 Author: Tupone Alfredo gentoo org> AuthorDate: Fri Oct 19 20:29:47 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 19 20:30:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1340f401 dev-ada/gprbuild: Fix gnatbind path Closes: https://bugs.gentoo.org/668964 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 10 ++ .../{gprbuild-2018-r2.ebuild => gprbuild-2018-r3.ebuild} | 0 2 files changed, 10 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index 9f62ec9ff9d..1f967b61d4c 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.xml2018-10-17 21:31:44.442501471 +0200 +++ b/share/gprconfig/c.xml2018-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-r3.ebuild similarity index 100% rename from dev-ada/gprbuild/gprbuild-2018-r2.ebuild rename to dev-ada/gprbuild/gprbuild-2018-r3.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: e4b0680c19c1deb6a5063740ee1082b85e2497d9 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 17 19:54:02 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 17 19:54:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b0680c dev-ada/gprbuild: bump to 2018-r2 trying to fix C builds Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 167 + dev-ada/gprbuild/files/gprbuild-2018.xml | 93 ...uild-2018-r1.ebuild => gprbuild-2018-r2.ebuild} | 18 ++- 3 files changed, 178 insertions(+), 100 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index 35a98ae03fc..9f62ec9ff9d 100644 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -96,3 +96,170 @@ when Copy_Source_Dir => Copy_Source_Directory := new String'(Line (1 .. Last)); +--- a/share/gprconfig/compilers.xml2018-10-17 14:36:15.100480516 +0200 b/share/gprconfig/compilers.xml2018-10-17 15:38:57.333256634 +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 + + + +@@ -170,14 +170,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-|.*-qnx.*)?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-|.*-qnx.*)?gnatls-@VER@ + +- ${PREFIX}gnatls -v --version ++ ${PREFIX}gnatls-@VER@ -v --version + + + Ada + +- ${PREFIX}gcc -v ++ ${PREFIX}gcc-@VER@ -v + + + +@@ -187,71 +187,11 @@ +\.\./$TARGET/lib/gnat/(.*)/adalib/ + + +- ${PREFIX}gcc -dumpmachine ++ ${PREFIX}gcc-@VER@ -dumpmachine + + + + +- +- +- +-GNAT_CODEPEER +-(.*codepeer-)gnatls +- +- ${PREFIX}gnatls -v +- +- +-Ada +- +- ${PREFIX}gcc -v +- +- +- +- \.\./lib/gcc/.*/$gcc_version/adalib/ +- \.\./lib/gnat/(.*)/adalib/ +- \.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/ +- +-codepeer +- +- +- +- +- +-GNAT_C +-(c-)gnatls +- +- ${PREFIX}gnatls -v +- +- +-Ada +- +- ${PREFIX}gcc -v +- +- +- +- \.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/ +- \.\./lib/gnat/(.*)/adalib/ +- +-c +- +- +- +- +- +-GNAT_DOTNET +-(.*dotnet-)gnatls +- +- ${PREFIX}gnatls -v +- +- +-Ada +- +- \.\./lib/dotgnat/adalib/ +- \.\./lib/dotgnat/rts-(.*)/adalib/ +- +-dotnet +- +- + + + G77 +@@ -295,21 +295,6 @@ + + + +- +- +-LLVM +-clang +- +- clang -v +- +- +-C +- +- clang -dumpmachine +- +- +- +- + + + WINDRES +--- a/share/gprconfig/gnat.xml 2018-10-17 18:38:35.547094541 +0200 b/share/gprconfig/gnat.xml 2018-10-17 18:40:16.281379341 +0200 +@@ -60,7 +60,7 @@ +_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 +--- a/share/gprconfig/c.xml2018-10-17 21:31:44.442501471 +0200 b/share/gprconfig/c.xml2018-10-17 21:33:06.562088044 +0200 +@@ -14,7 +14,7 @@ + + +package Compiler is +- for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc"; ++ for Driver ("C") use
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: d88c23c61a5605f06b26b6d34be43987e7751a36 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Oct 15 06:16:38 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Oct 15 06:51:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88c23c6 dev-ada/gprbuild: remove old version (dev-ada/gprbuild-2018) Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/gprbuild-2018.ebuild | 88 --- 1 file changed, 88 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild deleted file mode 100644 index 3d3b6f41c7d..000 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ /dev/null @@ -1,88 +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 - sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${PN}-2017.xml > gnat-${GCC_PV}.xml - default - 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 - doins gnat-${GCC_PV}.xml - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 41f88706dedf15129fff2b8fbd661cc529a0884f Author: Tupone Alfredo gentoo org> AuthorDate: Sun Oct 14 18:52:01 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Oct 14 18:52:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f88706 dev-ada/gprbuild: C files compiled only with gnat provided compiler Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018.xml | 93 dev-ada/gprbuild/gprbuild-2018-r1.ebuild | 89 ++ 2 files changed, 182 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml new file mode 100644 index 000..56c4f896919 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2018.xml @@ -0,0 +1,93 @@ + + + +GNAT-@VER@ +gnatls-@VER@ + + ${PREFIX}gnatls-@VER@ -v --version + + +Ada + + ${PREFIX}gcc-@VER@ -v + + + + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ + \.\./$TARGET/lib/gnat/(.*)/adalib/ + + + ${PREFIX}gcc-@VER@ -dumpmachine + + + + + + + + + + package Compiler is + 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 + ("-c", "-x", "ada", "-gnatA") + Compiler'Leading_Required_Switches ("Ada"); + for Mapping_File_Switches("Ada") use ("-gnatem="); + for Mapping_Spec_Suffix ("Ada") use "%s"; + for Mapping_Body_Suffix ("Ada") use "%b"; + for Config_File_Switches ("Ada") use ("-gnatec="); + for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; + for Multi_Unit_Switches ("Ada") use ("-gnateI"); + for Multi_Unit_Object_Separator ("Ada") use "~"; + for Config_Body_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; + for Config_Spec_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; + for Config_Body_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; + for Config_Spec_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; + for Config_Body_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Body_File_Name => ""*%b""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_Spec_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Spec_File_Name => ""*%s""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_File_Unique("Ada") use "False"; + for PIC_Option ("Ada") use ("-fPIC"); + for Leading_Required_Switches ("Ada") use +Compiler'Leading_Required_Switches ("Ada") ("--RTS=${RUNTIME_DIR(ada)}"); + for Driver ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@"; + for Leading_Required_Switches ("C") use +("-c", "-x", "c") Compiler'Leading_Required_Switches ("C"); + for Include_Switches_Via_Spec ("C") use ("cc1", "-I"); + for Max_Command_Line_Length use "8192"; + for Response_File_Format ("C") use "GCC_GNU"; + for Dependency_Switches ("C") use ("-MMD", "-MF", ""); + for PIC_Option ("C") use ("-fPIC"); + end Compiler; + + package Binder is + 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)}"; + +for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; + for Library_Encapsulated_Supported use "true"; + + + diff --git a/dev-ada/gprbuild/gprbuild-2018-r1.ebuild b/dev-ada/gprbuild/gprbuild-2018-r1.ebuild new file mode 100644 index 000..3f325332e8e --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2018-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=" +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 9670f34afab1041f619dec6fee99865f9a0cfe1b Author: Tupone Alfredo gentoo org> AuthorDate: Fri Oct 12 07:01:13 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 12 07:01:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9670f34a dev-ada/gprbuild: Remove duplicate file Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/gprbuild/files/gprbuild-2018.xml | 85 dev-ada/gprbuild/gprbuild-2018.ebuild| 4 +- 2 files changed, 2 insertions(+), 87 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2018.xml b/dev-ada/gprbuild/files/gprbuild-2018.xml deleted file mode 100644 index 9e1e47b512e..000 --- a/dev-ada/gprbuild/files/gprbuild-2018.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - -GNAT-@VER@ -gnatls-@VER@ - - ${PREFIX}gnatls-@VER@ -v --version - - -Ada - - ${PREFIX}gcc-@VER@ -v - - - - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path - \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ - \.\./$TARGET/lib/gnat/(.*)/adalib/ - - - ${PREFIX}gcc-@VER@ -dumpmachine - - - - - - - - - - package Compiler is - 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 - ("-c", "-x", "ada", "-gnatA") - Compiler'Leading_Required_Switches ("Ada"); - for Mapping_File_Switches("Ada") use ("-gnatem="); - for Mapping_Spec_Suffix ("Ada") use "%s"; - for Mapping_Body_Suffix ("Ada") use "%b"; - for Config_File_Switches ("Ada") use ("-gnatec="); - for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; - for Multi_Unit_Switches ("Ada") use ("-gnateI"); - for Multi_Unit_Object_Separator ("Ada") use "~"; - for Config_Body_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; - for Config_Spec_File_Name ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; - for Config_Body_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; - for Config_Spec_File_Name_Index ("Ada") use - "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; - for Config_Body_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " - " (Body_File_Name => ""*%b""," - " Casing => %c," - " Dot_Replacement => ""%d"");"; - for Config_Spec_File_Name_Pattern ("Ada") use - "pragma Source_File_Name_Project " - " (Spec_File_Name => ""*%s""," - " Casing => %c," - " Dot_Replacement => ""%d"");"; - for Config_File_Unique("Ada") use "False"; - for PIC_Option ("Ada") use ("-fPIC"); - for Leading_Required_Switches ("Ada") use -Compiler'Leading_Required_Switches ("Ada") ("--RTS=${RUNTIME_DIR(ada)}"); - end Compiler; - - package Binder is - 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)}"; - -for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; - for Library_Encapsulated_Supported use "true"; - - - diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild index 95d0bdafd85..3d3b6f41c7d 100644 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,7 @@ src_prepare() { else GCC_PV=7.3.1 fi - sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml + sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${PN}-2017.xml > gnat-${GCC_PV}.xml default sed -i \ -e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 3ea9779c9de7c7cea77aaff49dfd76957d2b1958 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jul 7 20:33:06 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jul 7 20:33:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea9779c dev-ada/gprbuild: Fix "-r and -pie may not be used together" error Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ada/gprbuild/gprbuild-2018.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild index f071a9a8850..95d0bdafd85 100644 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018.ebuild @@ -43,6 +43,10 @@ src_prepare() { -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() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: f03afbff00943f8b24b3587b61b6ec318a577b63 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jun 30 13:43:27 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jun 30 13:43:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03afbff dev-ada/gprbuild: Unable to compile xmlada with gnat_2016 Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ada/gprbuild/gprbuild-2018.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild index 19175a50933..f071a9a8850 100644 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018.ebuild @@ -26,7 +26,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" +REQUIRED_USE="!gnat_2016 ^^ ( gnat_2017 gnat_2018 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 605454f82f67d00417356c0889d77e4a6d784c7a Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 25 06:17:52 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 25 07:39:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=605454f8 dev-ada/gprbuild: Adapt to new gnat-gpl slot Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ada/gprbuild/gprbuild-2018.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2018.ebuild b/dev-ada/gprbuild/gprbuild-2018.ebuild index 2a10644bfbb..19175a50933 100644 --- a/dev-ada/gprbuild/gprbuild-2018.ebuild +++ b/dev-ada/gprbuild/gprbuild-2018.ebuild @@ -21,7 +21,7 @@ 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.0 )" + gnat_2018? ( dev-lang/gnat-gpl:7.3.1 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src @@ -35,7 +35,7 @@ src_prepare() { elif use gnat_2017; then GCC_PV=6.3.0 else - GCC_PV=7.3.0 + GCC_PV=7.3.1 fi sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml default
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 5ac2fb262f84e03b46e55c063f3d64bc50f5fc56 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jun 23 18:53:12 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jun 23 18:53:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac2fb26 dev-ada/gprbuild: Don't pass gnatbind_path to gnatbind Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 41 --- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch index c5225d8d11f..35a98ae03fc 100644 --- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -1,5 +1,5 @@ gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200 -+++ gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 +--- a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200 b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 @@ -67,6 +67,7 @@ for Switches ("gpr*.ad?") use Compiler'Default_Switches ("Ada") & ("-g1"); @@ -8,8 +8,8 @@ end Compiler; end GPR; gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old2017-11-19 13:09:18.947527738 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 +--- a/gpr/src/gpr-names.ads2017-11-19 13:09:18.947527738 +0100 b/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 @@ -27,6 +27,8 @@ Name_Buffer : String (1 .. 1_000_000); Name_Len: Natural := 0; @@ -19,8 +19,8 @@ procedure Get_Name_String (Id : Name_Id); procedure Get_Name_String (Id : Unit_Name_Type); procedure Get_Name_String (Id : File_Name_Type); gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old2017-11-19 13:10:27.674316703 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 +--- a/gpr/src/gpr-names.adb2017-11-19 13:10:27.674316703 +0100 b/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 @@ -354,6 +354,8 @@ Name_Chars.Append (ASCII.NUL); @@ -39,8 +39,8 @@ return Name_Entries.Last; end Name_Find; gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 -+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +--- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100 b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 @@ -53,6 +53,10 @@ return; end if; @@ -52,18 +52,20 @@ Add_Name ("a"); Add_Name ("b"); Add_Name ("c"); gprbuild-gpl-2017/src/gprlib.adb.old 2017-12-18 12:20:02.937317216 +0100 -+++ gprbuild-gpl-2017/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 -@@ -263,7 +263,7 @@ +--- a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100 b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 +@@ -263,7 +263,9 @@ Driver_Name : Name_Id := No_Name; - Gnatbind_Name : String_Access := new String'("gnatbind"); + Gnatbind_Name : String_Access := new String'("@GNATBIND@"); ++ ++ Gnatbind_Path_Option : constant String := "--gnatbind_path="; Compiler_Name : String_Access := new String'("gcc"); -@@ -2237,13 +2237,13 @@ +@@ -1944,13 +1946,13 @@ and then Line (Last - 2 .. Last) = "gcc" then Gnatbind_Name := @@ -79,3 +81,18 @@ end if; end if; +@@ -2100,7 +2102,13 @@ +Mapping_File_Name := new String'(Line (1 .. Last)); + + when Binding_Options => +- Binding_Options_Table.Append (Line (1 .. Last)); ++ if Last > Gnatbind_Path_Option'Length ++ and then Line (1 .. Gnatbind_Path_Option'Length) = ++ Gnatbind_Path_Option then ++ null; ++ else ++ Binding_Options_Table.Append (Line (1 .. Last)); ++ end if; + + when Copy_Source_Dir => +Copy_Source_Directory := new String'(Line (1 .. Last));
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 3d9e0024cf577d70fcc7b8780460cc005d7b417a Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jun 9 19:07:34 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jun 9 19:08:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d9e0024 dev-ada/gprbuild: Version bump to dev-ada/gprbuild-2018 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch | 81 + dev-ada/gprbuild/files/gprbuild-2018.xml | 85 +++ dev-ada/gprbuild/gprbuild-2018.ebuild | 84 ++ dev-ada/gprbuild/metadata.xml | 1 + 5 files changed, 253 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 215384713a4..75d4210b6e2 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,2 +1,4 @@ DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 +DIST gprbuild-gpl-2018-src.tar.gz 2479651 BLAKE2B b0e24f4d97f06fe84569f8f0284e1028fce8e4ae90cfd27ab31ada0988f4f1b37eca4868bc212a21d26fb1a0a7ba6f031062e16d9758ab211e2fee40e25077ab SHA512 d22c0133baa6a0b626a0c1d145b21865bd0699cd8155ca22727272b0f8988c78163410b432ae148e87099e931df19d51ea867981556c79cb1cceb25456333044 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 +DIST xmlada-gpl-2018-src.tar.gz 1582215 BLAKE2B 11012dab19f45507eeb5ce6ebec9a77ceb5dfb7749960922f0f48bb1b0409305fd43466a7af90b48ff0a0cf58612e8859274a92e0fe272b4e57a59b92a1725f1 SHA512 8970c4e68defad66625c1110554dadfc485fbbe42e832987593cf727e98f13dd87c90b84461187dbbe2b1051831e6e70f9f53d6a0cfc07451726d601b2856430 diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch new file mode 100644 index 000..c5225d8d11f --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch @@ -0,0 +1,81 @@ +--- gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200 gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 +@@ -67,6 +67,7 @@ + for Switches ("gpr*.ad?") use + Compiler'Default_Switches ("Ada") & ("-g1"); + end case; ++ for Driver ("C") use External ("CC", "gcc"); +end Compiler; + + end GPR; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old2017-11-19 13:09:18.947527738 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ +Name_Buffer : String (1 .. 1_000_000); +Name_Len: Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ +procedure Get_Name_String (Id : Name_Id); +procedure Get_Name_String (Id : Unit_Name_Type); +procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old2017-11-19 13:10:27.674316703 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c"); +--- gprbuild-gpl-2017/src/gprlib.adb.old 2017-12-18 12:20:02.937317216 +0100 gprbuild-gpl-2017/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100 +@@ -263,7 +263,7 @@ + +Driver_Name : Name_Id := No_Name; + +- Gnatbind_Name : String_Access := new String'("gnatbind"); ++ Gnatbind_Name : String_Access := new String'("@GNATBIND@"); + +Compiler_Name : String_Access := new String'("gcc"); + +@@ -2237,13 +2237,13 @@ + and then Line (Last - 2 .. Last) = "gcc" + then +Gnatbind_Name := +- new String'(Line (1 .. Last -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: c721871cbfe31a597dc1b7a6fd8bb96b5351a7db Author: Tupone Alfredo gentoo org> AuthorDate: Sat Apr 21 12:28:50 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Apr 21 12:28:50 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c721871c dev-ada/gprbuild: x86 stable Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ada/gprbuild/gprbuild-2017.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 15515016059..a8b5614d423 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -16,7 +16,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 +gnat_2017" DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: dcfd2fffaa63af65a4aa2c2973c877d055250554 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Feb 26 18:02:34 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Feb 26 18:02:34 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfd2fff dev-ada/gprbuild: Add ~x86 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ada/gprbuild/gprbuild-2017.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 3cc42ef2dbd..15515016059 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -16,7 +16,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~x86" IUSE="gnat_2016 +gnat_2017" DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: 0cd98c3391699469d497f823d29c036b4ce1ab80 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jan 20 20:57:27 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jan 20 20:57:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd98c33 dev-ada/gprbuild: Stable on amd64 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ada/gprbuild/gprbuild-2017.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 6f5f3f6a0d1..3cc42ef2dbd 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI=" -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="gnat_2016 +gnat_2017" DEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: c2e51c26146fb1db9aebb9dfaf138f619c7d25cd Author: Tupone Alfredo gentoo org> AuthorDate: Wed Dec 20 07:53:28 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Dec 20 07:53:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e51c26 dev-ada/gprbuild: remove /usr/share/gpr to the project dirs Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 11 --- 1 file changed, 11 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index d6d4ff97c2b..3f74f808e0a 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -21,17 +21,6 @@ end if; end if; gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 -@@ -1948,6 +1948,8 @@ - - end if; - -+ Add_Directories (Self, "/usr/share/gpr"); -+ - if Gpr_Prj_Path.all /= "" then - Add_Directories (Self, Gpr_Prj_Path.all); - end if; --- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old2017-11-19 13:09:18.947527738 +0100 +++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 @@ -27,6 +27,8 @@
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 107bb1d8798d0a0a1c2d32a6d212f3d92c79c3fc Author: Tupone Alfredo gentoo org> AuthorDate: Tue Dec 19 08:00:08 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Dec 19 08:00:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107bb1d8 dev-ada/gprbuild: use gnatbind versioned and remove old ebuild Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gprbuild/Manifest | 2 - dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 271 -- dev-ada/gprbuild/files/gprbuild-2016.xml | 94 dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 27 +++ dev-ada/gprbuild/gprbuild-2016.ebuild | 77 -- dev-ada/gprbuild/gprbuild-2017.ebuild | 4 + 6 files changed, 31 insertions(+), 444 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index f19ce633287..215384713a4 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,2 @@ -DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 -DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch deleted file mode 100644 index ddf5a0c3309..000 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-main.adb gprbuild-gpl-2016-src/src/gprbuild-main.adb gprbuild-gpl-2016-src.old/src/gprbuild-main.adb2017-03-28 09:12:24.205058242 +0200 -+++ gprbuild-gpl-2016-src/src/gprbuild-main.adb2017-03-28 09:21:20.495344963 +0200 -@@ -52,7 +52,8 @@ - with GPR.Tempdir;use GPR.Tempdir; - with GPR.Tree; use GPR.Tree; - with GPR.Util; use GPR.Util; -+with Gprbuild.Sigint_Intercepted; - - procedure Gprbuild.Main is - -use Stamps; -@@ -124,11 +124,6 @@ -pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler"); --- Called by Gnatmake to install the SIGINT handler below - -- procedure Sigint_Intercepted; -- pragma Convention (C, Sigint_Intercepted); -- -- Called when the program is interrupted by Ctrl-C to delete the -- -- temporary mapping files and configuration pragmas files. -- -No_Object_Check_Switch : constant String := "--no-object-check"; -Direct_Import_Only_Switch : constant String := "--direct-import-only"; -Indirect_Imports_Switch: constant String := "--indirect-imports"; -@@ -1616,22 +1611,6 @@ - end if; -end Scan_Arg; - -- -- -- Sigint_Intercepted -- -- -- -- procedure Sigint_Intercepted is -- begin -- Put_Line ("*** Interrupted ***"); -- Delete_All_Temp_Files (Project_Tree.Shared); -- -- if Distributed_Mode then -- Compilation.Slave.Unregister_Remote_Slaves (From_Signal => True); -- end if; -- -- OS_Exit (1); -- end Sigint_Intercepted; -- - --- Initialize -- - -@@ -2293,7 +2272,7 @@ - --- And install Ctrl-C handler - -- Install_Int_Handler (Sigint_Intercepted'Unrestricted_Access); -+ Install_Int_Handler (Gprbuild.Sigint_Intercepted'Unrestricted_Access); - --- Check command line arguments. These will be overridden when looking --- for the configuration file -diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb 1970-01-01 01:00:00.0 +0100 -+++ gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb 2017-03-28 09:20:00.661792854 +0200 -@@ -0,0 +1,20 @@ -+ -+--
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: f171efd9be83954dac8e37496bf6d4b0d9930c8a Author: Tupone Alfredo gentoo org> AuthorDate: Sat Dec 2 21:23:50 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Dec 2 21:23:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f171efd9 dev-ada/gprbuild: removed bootstrap and library moved to dev-ada/libgpr Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gprbuild/gprbuild-2016.ebuild | 77 dev-ada/gprbuild/gprbuild-2017.ebuild | 83 +++ dev-ada/gprbuild/metadata.xml | 3 -- 3 files changed, 53 insertions(+), 110 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index 162f31f1ee4..5559e173f19 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -12,23 +12,20 @@ HOMEPAGE="http://libre.adacore.com/; SRC_URI=" http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 -> ${MYP}-src.tar.gz - bootstrap? ( - http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 - -> xmlada-gpl-${PV}-src.tar.gz )" + http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 + -> xmlada-gpl-${PV}-src.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic" +IUSE="+gnat_2016 gnat_2017" -DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) - gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) +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="bootstrap? ( !shared !static !static-pic ) - ^^ ( gnat_2016 gnat_2017 )" +REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { @@ -42,9 +39,7 @@ src_prepare() { } src_configure() { - if ! use bootstrap ; then - default - fi + : } bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" @@ -52,48 +47,30 @@ lib_progs="gprlib gprbind" src_compile() { GCC=${CHOST}-gcc-${GCC_PV} - if use bootstrap; then - 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} 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 - else - emake PROCESSORS=$(makeopts_jobs) all - for kind in shared static static-pic; do - if use ${kind}; then - emake PROCESSORS=$(makeopts_jobs) libgpr.build.${kind} - fi - done - fi + 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} 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() { - if use bootstrap; then - 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 - else - default - for kind in shared static static-pic; do - if use ${kind}; then - emake DESTDIR="${D}" libgpr.install.${kind} - fi - done - fi + 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
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: fc796651d1aa66da220f2dcd9cee523fa95ed6a6 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Nov 26 18:17:09 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 26 18:17:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc796651 dev-ada/gprbuild: Set default use flags Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gprbuild/Manifest | 8 dev-ada/gprbuild/gprbuild-2016.ebuild | 2 +- dev-ada/gprbuild/gprbuild-2017.ebuild | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index dab1b96f734..f19ce633287 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,4 +1,4 @@ -DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945 -DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781 -DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7 -DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd +DIST gprbuild-gpl-2016-src.tar.gz 2142261 BLAKE2B 69948427eb6315b9fb2b84755192b53c035f74093dacb34852713083779bf8bd88dac6b38fe7685f6a40ecb2482f78b15a5221913df997847eee8b1359cf6c14 SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e +DIST gprbuild-gpl-2017-src.tar.gz 2454957 BLAKE2B 890e5aa29e9f8fa8b140988ee8e5d6042640c34fe0877acde959de803bf690bb33c63b1c7e7db486f804882bddd77ab76ffbaa4dd27da327e21ed0376cadb99d SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 +DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 +DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index 60d1b029292..162f31f1ee4 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" +IUSE="bootstrap +gnat_2016 gnat_2017 +shared static static-pic" DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index a6101175e17..889b9667cf1 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" +IUSE="bootstrap gnat_2016 +gnat_2017 +shared static static-pic" DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: f7ac2eb90f4b7e0ceaefbcbd7b587d7e6158a79b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Nov 19 13:00:40 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 19 13:00:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ac2eb9 dev-ada/gprbuild: Fix Name_Id constants Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 44 +++ dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 44 +++ 2 files changed, 88 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index d54c8da0019..ddf5a0c3309 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -225,3 +225,47 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu if Gpr_Prj_Path.all /= "" then Add_Directories (Self, Gpr_Prj_Path.all); end if; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old2017-11-19 13:09:18.947527738 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ +Name_Buffer : String (1 .. 1_000_000); +Name_Len: Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ +procedure Get_Name_String (Id : Name_Id); +procedure Get_Name_String (Id : Unit_Name_Type); +procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old2017-11-19 13:10:27.674316703 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c"); diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index 57b3bfe213e..79a07a34988 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -32,3 +32,47 @@ if Gpr_Prj_Path.all /= "" then Add_Directories (Self, Gpr_Prj_Path.all); end if; +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old2017-11-19 13:09:18.947527738 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.ads2017-11-19 13:10:08.125654595 +0100 +@@ -27,6 +27,8 @@ +Name_Buffer : String (1 .. 1_000_000); +Name_Len: Natural := 0; + ++ Last_Id : Name_Id := Name_Id'First; ++ +procedure Get_Name_String (Id : Name_Id); +procedure Get_Name_String (Id : Unit_Name_Type); +procedure Get_Name_String (Id : File_Name_Type); +--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old2017-11-19 13:10:27.674316703 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-names.adb2017-11-19 13:14:38.360963627 +0100 +@@ -354,6 +354,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Enter; + +@@ -427,6 +429,8 @@ + + Name_Chars.Append (ASCII.NUL); + ++ Last_Id := Name_Entries.Last; ++ + return Name_Entries.Last; +end Name_Find; + +--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100 gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100 +@@ -53,6 +53,10 @@ + return; + end if; + ++ if Last_Id = Name_Id'First then ++ Add_Name (""); ++ end if; ++ + Add_Name ("a"); + Add_Name ("b"); + Add_Name ("c");
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 96ae78b9e81026b99a058897ee5306e565e4d4ad Author: Tupone Alfredo gentoo org> AuthorDate: Tue Nov 14 18:22:26 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Nov 14 18:22:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ae78b9 dev-ada/gprbuild: Really add /usr/share/gpr in front of the path Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 25 +-- dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 23 - 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index 53cc4df8a30..d54c8da0019 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -214,19 +214,14 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu package Binder is make BUILDER="$(BUILDER)" BUILD="$(BUILD)" gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200 -@@ -1932,6 +1932,13 @@ -end if; - end if; - -+Compiler_Root := First_Compiler_Root; -+First_Compiler_Root := -+ new Compiler_Root_Data' -+(Root => new String'("/usr"), -+ Runtimes => null, -+ Next => Compiler_Root); -+ - -- Reorder the compiler roots in the PATH order +--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 +@@ -1948,6 +1948,8 @@ + + end if; - if First_Compiler_Root /= null ++ Add_Directories (Self, "/usr/share/gpr"); ++ + if Gpr_Prj_Path.all /= "" then + Add_Directories (Self, Gpr_Prj_Path.all); + end if; diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index fb494aeaafc..57b3bfe213e 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -21,19 +21,14 @@ end if; end if; gprbuild-17.0/gpr/src/gpr-conf.adb.old 2017-05-17 14:40:26.0 +0200 -+++ gprbuild-17.0/gpr/src/gpr-conf.adb 2017-11-10 22:44:38.482432592 +0100 -@@ -1932,6 +1932,13 @@ -end if; - end if; +--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100 gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100 +@@ -1948,6 +1948,8 @@ -+Compiler_Root := First_Compiler_Root; -+First_Compiler_Root := -+ new Compiler_Root_Data' -+(Root => new String'("/usr"), -+ Runtimes => null, -+ Next => Compiler_Root); -+ - -- Reorder the compiler roots in the PATH order + end if; - if First_Compiler_Root /= null ++ Add_Directories (Self, "/usr/share/gpr"); ++ + if Gpr_Prj_Path.all /= "" then + Add_Directories (Self, Gpr_Prj_Path.all); + end if;
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 5825a5038327a2b6b0c40917f3e9530e15a92ec0 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Nov 11 17:44:08 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Nov 11 17:44:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5825a503 dev-ada/gprbuild: Fix local patch against a constraint error Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 17 +++-- dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 21 + 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index 94973bfceac..53cc4df8a30 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -216,20 +216,17 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu make BUILDER="$(BUILDER)" BUILD="$(BUILD)" --- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200 +++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200 -@@ -1839,6 +1839,16 @@ -end; +@@ -1932,6 +1932,13 @@ +end if; end if; +Compiler_Root := First_Compiler_Root; -+while Compiler_Root.Next /= null loop -+ Compiler_Root := Compiler_Root.Next; -+end loop; -+Compiler_Root.Next := ++First_Compiler_Root := + new Compiler_Root_Data' +(Root => new String'("/usr"), + Runtimes => null, -+ Next => null); ++ Next => Compiler_Root); + - -- Now that the compiler roots are in a correct order, add the - -- directories corresponding to these compiler roots in the - -- project path. + -- Reorder the compiler roots in the PATH order + + if First_Compiler_Root /= null diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index c784920eaf3..fb494aeaafc 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -21,22 +21,19 @@ end if; end if; gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200 -@@ -1839,6 +1839,16 @@ -end; +--- gprbuild-17.0/gpr/src/gpr-conf.adb.old 2017-05-17 14:40:26.0 +0200 gprbuild-17.0/gpr/src/gpr-conf.adb 2017-11-10 22:44:38.482432592 +0100 +@@ -1932,6 +1932,13 @@ +end if; end if; +Compiler_Root := First_Compiler_Root; -+while Compiler_Root.Next /= null loop -+ Compiler_Root := Compiler_Root.Next; -+end loop; -+Compiler_Root.Next := ++First_Compiler_Root := + new Compiler_Root_Data' +(Root => new String'("/usr"), + Runtimes => null, -+ Next => null); ++ Next => Compiler_Root); + - -- Now that the compiler roots are in a correct order, add the - -- directories corresponding to these compiler roots in the - -- project path. + -- Reorder the compiler roots in the PATH order + + if First_Compiler_Root /= null
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
commit: 891b88eb778bfe9b7c3cad47831b95adb610e34e Author: Tupone Alfredo gentoo org> AuthorDate: Tue Sep 12 19:47:23 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Sep 12 19:49:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891b88eb dev-ada/gprbuild: add /usr to the search path for gpr files Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 19 +++ dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 19 +++ 2 files changed, 38 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index f3566e87adb..94973bfceac 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -214,3 +214,22 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu package Binder is make BUILDER="$(BUILDER)" BUILD="$(BUILD)" +--- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200 gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200 +@@ -1839,6 +1839,16 @@ +end; + end if; + ++Compiler_Root := First_Compiler_Root; ++while Compiler_Root.Next /= null loop ++ Compiler_Root := Compiler_Root.Next; ++end loop; ++Compiler_Root.Next := ++ new Compiler_Root_Data' ++(Root => new String'("/usr"), ++ Runtimes => null, ++ Next => null); ++ + -- Now that the compiler roots are in a correct order, add the + -- directories corresponding to these compiler roots in the + -- project path. diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch index 70491e177a7..c784920eaf3 100644 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -21,3 +21,22 @@ end if; end if; +--- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200 gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200 +@@ -1839,6 +1839,16 @@ +end; + end if; + ++Compiler_Root := First_Compiler_Root; ++while Compiler_Root.Next /= null loop ++ Compiler_Root := Compiler_Root.Next; ++end loop; ++Compiler_Root.Next := ++ new Compiler_Root_Data' ++(Root => new String'("/usr"), ++ Runtimes => null, ++ Next => null); ++ + -- Now that the compiler roots are in a correct order, add the + -- directories corresponding to these compiler roots in the + -- project path.
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: e863600c2ba1b16b5d0a05eb68c6c91a37650c00 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jul 1 16:32:46 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jul 1 16:32:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e863600c dev-ada/gprbuild: rm version Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild--gentoo.patch | 44 - dev-ada/gprbuild/gprbuild-.ebuild | 111 -- 2 files changed, 155 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild--gentoo.patch b/dev-ada/gprbuild/files/gprbuild--gentoo.patch deleted file mode 100644 index bebe795de96..000 --- a/dev-ada/gprbuild/files/gprbuild--gentoo.patch +++ /dev/null @@ -1,44 +0,0 @@ gprbuild-/Makefile.old 2017-05-07 09:46:00.002669301 +0200 -+++ gprbuild-/Makefile 2017-05-07 09:47:37.832171592 +0200 -@@ -74,7 +74,8 @@ - CLEANER=gprclean -q $(RBD) - - GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \ -- -XLIBRARY_TYPE=static -XXMLADA_BUILD=static -+ -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \ -+ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) - LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) - LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \ - --install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET) -@@ -136,15 +136,18 @@ - - libgpr.build.shared: - ${BUILDER} -XLIBRARY_TYPE=relocatable \ -- -XXMLADA_BUILD=relocatable $(GPR_GPR) -+ -XXMLADA_BUILD=relocatable $(GPR_GPR) \ -+ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) - - libgpr.build.static: - ${BUILDER} -XLIBRARY_TYPE=static \ -- -XXMLADA_BUILD=static $(GPR_GPR) -+ -XXMLADA_BUILD=static $(GPR_GPR) \ -+ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) - - libgpr.build.static-pic: - ${BUILDER} -XLIBRARY_TYPE=static-pic \ -- -XXMLADA_BUILD=static-pic $(GPR_GPR) -+ -XXMLADA_BUILD=static-pic $(GPR_GPR) \ -+ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) - - libgpr.install: libgpr.uninstall $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) - gprbuild-/gpr/gpr.gpr.old 2017-05-07 10:00:30.688087076 +0200 -+++ gprbuild-/gpr/gpr.gpr 2017-05-07 10:00:45.028863862 +0200 -@@ -67,6 +67,7 @@ - for Switches ("gpr*.ad?") use - Compiler'Default_Switches ("Ada") & ("-g1"); - end case; -+ for Driver ("C") use External ("CC", "gcc"); -end Compiler; - - end GPR; diff --git a/dev-ada/gprbuild/gprbuild-.ebuild b/dev-ada/gprbuild/gprbuild-.ebuild deleted file mode 100644 index 86fb99df1e2..000 --- a/dev-ada/gprbuild/gprbuild-.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit git-r3 toolchain-funcs multiprocessing - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="Multi-Language Management" -HOMEPAGE="http://libre.adacore.com/; -SRC_URI=" - bootstrap? ( - http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 - -> xmlada-gpl-2016-src.tar.gz )" -EGIT_REPO_URI="https://github.com/AdaCore/gprbuild.git; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="bootstrap +shared static static-pic" - -DEPEND="dev-lang/gnat-gpl:= - >=dev-python/sphinx-1.5.2 - !bootstrap? ( dev-ada/xmlada[static] )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -pkg_setup() { - GCC=${ADA:-$(tc-getCC)} - GNATMAKE="${GCC/gcc/gnatmake}" - if [[ -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 ADA=gcc-4.9.4 in make.conf" - die "ada compiler not available" - fi -} - -src_unpack() { - git-r3_src_unpack - default -} -src_prepare() { - sed -i \ - -e "/gnatls/d" \ - Makefile || die - default -} - -src_configure() { - make prefix="${D}"usr setup - default -} - -bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" -lib_progs="gprlib gprbind" - -src_compile() { - if use bootstrap; then - local xmlada_src="../xmlada-gpl-2016-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" - $(tc-getCC) -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o - for bin in ${bin_progs}; do - ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ - -o ${bin} -largs gpr_imports.o
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: cea81d0f521d474af7a09b0df8fd2dfeefd46ae6 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Jun 27 07:05:50 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 27 07:05:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea81d0f dev-ada/gprbuild: Add use flags gnat_2016 & gnat_2017 to 2016 version too Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2016.ebuild | 38 ++- dev-ada/gprbuild/gprbuild-2017.ebuild | 7 +++ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index c880ef95b51..60d1b029292 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -15,35 +15,28 @@ SRC_URI=" bootstrap? ( http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> xmlada-gpl-${PV}-src.tar.gz )" - LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap +shared static static-pic" +IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" -DEPEND="dev-lang/gnat-gpl:= - !bootstrap? ( dev-ada/xmlada )" +DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + 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="bootstrap? ( !shared !static !static-pic )" +REQUIRED_USE="bootstrap? ( !shared !static !static-pic ) + ^^ ( gnat_2016 gnat_2017 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -pkg_setup() { - GCC=${ADA:-$(tc-getCC)} - GNATMAKE="${GCC/gcc/gnatmake}" - if [[ -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 ADA=gcc-4.9.4 in make.conf" - die "ada compiler not available" - fi -} - src_prepare() { - gnatbase=$(basename ${GCC}) - GCC_PV=${gnatbase#*gcc-} + if use gnat_2016; then + GCC_PV=4.9.4 + else + GCC_PV=6.3.0 + fi sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml default } @@ -58,12 +51,14 @@ bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" src_compile() { + GCC=${CHOST}-gcc-${GCC_PV} if use bootstrap; then + 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" - $(tc-getCC) -c ${CFLAGS} src/gpr_imports.c -o gpr_imports.o + ${GCC} -c ${CFLAGS} 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 @@ -88,7 +83,7 @@ src_install() { exeinto /usr/libexec/gprbuild doexe ${lib_progs} insinto /usr/share/gprconfig - doins share/gprconfig/*.xml + doins share/gprconfig/* insinto /usr/share/gpr doins share/_default.gpr else @@ -98,9 +93,6 @@ src_install() { emake DESTDIR="${D}" libgpr.install.${kind} fi done - mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die - mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die - rmdir "${D}"/usr/share/doc/${PN} || die fi insinto /usr/share/gprconfig doins gnat-${GCC_PV}.xml diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 60fa7d00f00..a6101175e17 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -20,10 +20,9 @@ SLOT="0" KEYWORDS="~amd64" IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" -DEPEND=" - !bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) - gnat_2016? ( =dev-lang/gnat-gpl-2016 ) - gnat_2017? ( =dev-lang/gnat-gpl-2017 )" +DEPEND="!bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: e8347eefda91406fa8553e4328584b66df8010ad Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 26 20:03:11 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 26 20:03:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8347eef dev-ada/gprbuild: add gnat_2016 and gnat_2017 use flags to select the compiler Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2017.ebuild | 39 +-- dev-ada/gprbuild/metadata.xml | 15 +- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 277fb5c5f3f..60fa7d00f00 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -18,39 +18,26 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="bootstrap +shared static static-pic" +IUSE="bootstrap gnat_2016 gnat_2017 +shared static static-pic" -DEPEND="dev-lang/gnat-gpl:= - !bootstrap? ( dev-ada/xmlada[static] )" +DEPEND=" + !bootstrap? ( dev-ada/xmlada[static,gnat_2016=,gnat_2017=] ) + gnat_2016? ( =dev-lang/gnat-gpl-2016 ) + gnat_2017? ( =dev-lang/gnat-gpl-2017 )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src -REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" +REQUIRED_USE="bootstrap? ( !shared !static !static-pic ) + ^^ ( gnat_2016 gnat_2017 )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -pkg_setup() { - GCC=${ADA:-$(tc-getCC)} - gnatbase=$(basename ${GCC}) - if use bootstrap; then - gnatpath=$(dirname ${GCC}) - - GNATMAKE="${gnatbase/gcc/gnatmake}" - if [[ ${gnatpath} != "." ]] ; then - GNATMAKE="${gnatpath}/${GNATMAKE}" - fi - - if [[ -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 ADA in make.conf" - die "ada compiler not available" - fi - fi -} - src_prepare() { - GCC_PV=${gnatbase#*gcc-} + if use gnat_2016; then + GCC_PV=4.9.4 + else + GCC_PV=6.3.0 + fi sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml default } @@ -63,7 +50,9 @@ bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" src_compile() { + GCC=${CHOST}-gcc-${GCC_PV} if use bootstrap; then + 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 \ diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml index 521d595c3ff..4cf88165a98 100644 --- a/dev-ada/gprbuild/metadata.xml +++ b/dev-ada/gprbuild/metadata.xml @@ -6,15 +6,20 @@ Tupone Alfredo + Compile with dev-lang/gnat-gpl-2016 + Compile with dev-lang/gnat-gpl-2017 Build shared library Build static library Build static library with pic code -XML/Ada is a set of modules that provide a simple manipulation of XML streams. It supports the whole XML 1.1 specifications, and can parse any file that follows this standard (including the contents of the DTD, although no validation of the document is done based on those). - -It also provides support for a number of other standard associated with XML, like SAX, DOM and XML schemas. - -In addition, it includes a module to manipulate Unicode streams, since this is required by the XML standard. + GPRbuild is an advanced software tool designed to help automate the + construction of multi-language systems. It removes complexity from + multi-language development by allowing developers to quickly and easily + compile and link software written in a combination of languages + including Ada, Assembler, C, C++, and Fortran. Easily extendable by + users to cover new toolchains and languages it is primarily aimed at + projects of all sizes organized into subsystems and libraries and is + particularly well-suited for compiled languages.
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: bb321bc789c4454f73f7ed939c87092b1d387cd4 Author: Tupone Alfredo gentoo org> AuthorDate: Sat Jun 24 13:46:22 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jun 24 13:46:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb321bc7 dev-ada/gprbuild: Fix tool description Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2017.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 0f7b634ec96..277fb5c5f3f 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -30,9 +30,9 @@ REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) pkg_setup() { + GCC=${ADA:-$(tc-getCC)} + gnatbase=$(basename ${GCC}) if use bootstrap; then - GCC=${ADA:-$(tc-getCC)} - gnatbase=$(basename ${GCC}) gnatpath=$(dirname ${GCC}) GNATMAKE="${gnatbase/gcc/gnatmake}" @@ -50,7 +50,6 @@ pkg_setup() { } src_prepare() { - gnatbase=$(basename ${GCC}) GCC_PV=${gnatbase#*gcc-} sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml default
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 6ee3ef271a151c6e2351ffa3ec38d49f1b30cdcf Author: Tupone Alfredo gentoo org> AuthorDate: Fri Jun 23 19:39:54 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Jun 23 19:41:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ee3ef27 dev-ada/gprbuild: Add compiler description file Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild-2017.xml | 85 dev-ada/gprbuild/gprbuild-2017.ebuild| 9 2 files changed, 94 insertions(+) diff --git a/dev-ada/gprbuild/files/gprbuild-2017.xml b/dev-ada/gprbuild/files/gprbuild-2017.xml new file mode 100644 index 000..9e1e47b512e --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2017.xml @@ -0,0 +1,85 @@ + + + +GNAT-@VER@ +gnatls-@VER@ + + ${PREFIX}gnatls-@VER@ -v --version + + +Ada + + ${PREFIX}gcc-@VER@ -v + + + + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ + \.\./$TARGET/lib/gnat/(.*)/adalib/ + + + ${PREFIX}gcc-@VER@ -dumpmachine + + + + + + + + + + package Compiler is + 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 + ("-c", "-x", "ada", "-gnatA") + Compiler'Leading_Required_Switches ("Ada"); + for Mapping_File_Switches("Ada") use ("-gnatem="); + for Mapping_Spec_Suffix ("Ada") use "%s"; + for Mapping_Body_Suffix ("Ada") use "%b"; + for Config_File_Switches ("Ada") use ("-gnatec="); + for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; + for Multi_Unit_Switches ("Ada") use ("-gnateI"); + for Multi_Unit_Object_Separator ("Ada") use "~"; + for Config_Body_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; + for Config_Spec_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; + for Config_Body_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; + for Config_Spec_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; + for Config_Body_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Body_File_Name => ""*%b""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_Spec_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Spec_File_Name => ""*%s""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_File_Unique("Ada") use "False"; + for PIC_Option ("Ada") use ("-fPIC"); + for Leading_Required_Switches ("Ada") use +Compiler'Leading_Required_Switches ("Ada") ("--RTS=${RUNTIME_DIR(ada)}"); + end Compiler; + + package Binder is + 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)}"; + +for Runtime_Dir ("Ada") use "${RUNTIME_DIR(ada)}"; + for Library_Encapsulated_Supported use "true"; + + + diff --git a/dev-ada/gprbuild/gprbuild-2017.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild index 3165385d33c..0f7b634ec96 100644 --- a/dev-ada/gprbuild/gprbuild-2017.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -49,6 +49,13 @@ pkg_setup() { fi } +src_prepare() { + gnatbase=$(basename ${GCC}) + GCC_PV=${gnatbase#*gcc-} + sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml + default +} + src_configure() { emake prefix="${D}"usr setup } @@ -108,5 +115,7 @@ src_install() { done rm "${D}"usr/doinstall || die fi + insinto /usr/share/gprconfig + doins gnat-${GCC_PV}.xml einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: e9989d791181545303167f7629934981ff99da4f Author: Tupone Alfredo gentoo org> AuthorDate: Thu Jun 22 20:02:02 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Jun 22 20:02:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9989d79 dev-ada/gprbuild: Add build tool instruction to gprbuild-2016 Package-Manager: Portage-2.3.5, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild-2016.xml | 94 dev-ada/gprbuild/gprbuild-2016.ebuild| 11 +++- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2016.xml b/dev-ada/gprbuild/files/gprbuild-2016.xml new file mode 100644 index 000..7d321e03b6a --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2016.xml @@ -0,0 +1,94 @@ + + + +GNAT-@VER@ +gnatmake-@VER@ + + ${PREFIX}gnatls-@VER@ -v --version + + +Ada + + ${PREFIX}gcc-@VER@ -v + + + + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/adalib/ + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/ada_object_path + \.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/ + \.\./$TARGET/lib/gnat/(.*)/adalib/ + + + ${PREFIX}gcc-@VER@ -dumpmachine + + + + + + + + + + package Naming is + for Spec_Suffix ("Ada") use ".ads"; + for Body_Suffix ("Ada") use ".adb"; + for Casing use "lowercase"; + for Dot_Replacement use "-"; + end Naming; + + package Compiler is + 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 + ("-c", "-x", "ada", "-gnatA") + Compiler'Leading_Required_Switches ("Ada"); + for Mapping_File_Switches("Ada") use ("-gnatem="); + for Mapping_Spec_Suffix ("Ada") use "%s"; + for Mapping_Body_Suffix ("Ada") use "%b"; + for Config_File_Switches ("Ada") use ("-gnatec="); + for Include_Path_File ("Ada") use "ADA_PRJ_INCLUDE_FILE"; + for Multi_Unit_Switches ("Ada") use ("-gnateI"); + for Multi_Unit_Object_Separator ("Ada") use "~"; + for Config_Body_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"");"; + for Config_Spec_File_Name ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"");"; + for Config_Body_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Body_File_Name => ""%f"", Index => %i);"; + for Config_Spec_File_Name_Index ("Ada") use + "pragma Source_File_Name_Project (%u, Spec_File_Name => ""%f"", Index => %i);"; + for Config_Body_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Body_File_Name => ""*%b""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_Spec_File_Name_Pattern ("Ada") use + "pragma Source_File_Name_Project " + " (Spec_File_Name => ""*%s""," + " Casing => %c," + " Dot_Replacement => ""%d"");"; + for Config_File_Unique("Ada") use "False"; + for PIC_Option ("Ada") use ("-fPIC"); + end Compiler; + + package Binder is + 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@"); + end Binder; + + package Clean is + for Source_Artifact_Extensions ("Ada") + use (".dg", ".rep", ".stdout", ".stderr"); + for Object_Artifact_Extensions ("Ada") use (".s", ".ci", ".gcno"); + end Clean; + + for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}"; + for Runtime_Library_Dir ("Ada") use "${RUNTIME_DIR(ada)}/adalib/"; + for Runtime_Source_Dirs ("Ada") use ("${RUNTIME_DIR(ada)}/adainclude/"); + for Library_Encapsulated_Supported use "true"; + + + diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index a3691ac46ff..c880ef95b51 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -41,6 +41,13 @@ pkg_setup() { fi } +src_prepare() { + gnatbase=$(basename ${GCC}) + GCC_PV=${gnatbase#*gcc-} + sed -e "s:@VER@:${GCC_PV}:g" "${FILESDIR}"/${P}.xml > gnat-${GCC_PV}.xml + default +} + src_configure() { if ! use bootstrap ; then default @@ -78,9 +85,9 @@ src_compile() { src_install() { if use bootstrap; then dobin ${bin_progs} - insinto /usr/share/gprconfig exeinto /usr/libexec/gprbuild doexe ${lib_progs} +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/, dev-ada/gprbuild/
commit: 2d535a0cf60f54e3fd5057aa3d4e4c05df6a6e63 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 19 20:19:09 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 19 20:19:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d535a0c dev-ada/gprbuild: Add version 2017 Package-Manager: Portage-2.3.5, Repoman-2.3.1 dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 23 dev-ada/gprbuild/gprbuild-2016.ebuild | 2 +- .../{gprbuild-2016.ebuild => gprbuild-2017.ebuild} | 61 +- dev-ada/gprbuild/gprbuild-.ebuild | 4 +- 5 files changed, 65 insertions(+), 27 deletions(-) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest index 1642070972e..dab1b96f734 100644 --- a/dev-ada/gprbuild/Manifest +++ b/dev-ada/gprbuild/Manifest @@ -1,2 +1,4 @@ DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945 +DIST gprbuild-gpl-2017-src.tar.gz 2454957 SHA256 0d0a48b8744e4f7230a85008d8213b583459046395704e8ab8c5cabedbf7c616 SHA512 12f3682d64ce0718de4940c1e71a4380b20021805d88543842dbf3b5ce5d518c23a6b2d868565579baf81efa1d8cf05c7778253162f0df5d7adc0eb1865c9f88 WHIRLPOOL 905b3a6d64a7f8a6970586b5d1c010badcc24c42e4b406ed7508e0470920b86d0992e80dc2326b10a314cb27519944f5199a7f0d75e72dae8fb096180c22a781 DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7 +DIST xmlada-gpl-2017-src.tar.gz 1578393 SHA256 9b103157eb3ecd697b597ad4e60f56f39028bc2d6ea513d2dce8a3b0e65ac54b SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 WHIRLPOOL 4b2da3fb799f8def6eb6383a9483258340368cc80e96e8ffab207c3c8849c1279a80cf68ca47c8a20ce91c084041bdfa95128a14321454055534d804272ef4dd diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch new file mode 100644 index 000..70491e177a7 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch @@ -0,0 +1,23 @@ +--- gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200 gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200 +@@ -67,6 +67,7 @@ + for Switches ("gpr*.ad?") use + Compiler'Default_Switches ("Ada") & ("-g1"); + end case; ++ for Driver ("C") use External ("CC", "gcc"); +end Compiler; + + end GPR; +--- gprbuild-17.0/src/gprbuild-post_compile.adb.old2017-05-18 14:17:06.114797015 +0200 gprbuild-17.0/src/gprbuild-post_compile.adb2017-05-18 14:18:55.466956852 +0200 +@@ -4744,7 +4744,9 @@ + No_Create => Proj.Is_Aggregated); +end if; + +- Shared_Libs := not Is_Static (Proj.Proj); ++ if not Is_Static (Proj.Proj) then ++ Shared_Libs := True; ++ end if; + + end if; + end if; diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index b021ddc6047..a3691ac46ff 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -21,7 +21,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="bootstrap +shared static static-pic" -DEPEND="dev-lang/gnat-gpl +DEPEND="dev-lang/gnat-gpl:= !bootstrap? ( dev-ada/xmlada )" RDEPEND="${DEPEND}" diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2017.ebuild similarity index 53% copy from dev-ada/gprbuild/gprbuild-2016.ebuild copy to dev-ada/gprbuild/gprbuild-2017.ebuild index b021ddc6047..3165385d33c 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2017.ebuild @@ -10,19 +10,18 @@ MYP=${PN}-gpl-${PV} DESCRIPTION="Multi-Language Management" HOMEPAGE="http://libre.adacore.com/; SRC_URI=" - http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 + http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deecff7 -> ${MYP}-src.tar.gz bootstrap? ( - http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 + http://mirrors.cdn.adacore.com/art/591aeb88c7a4473fcbb154f8
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: c36f364ec4441c9786077e11754d6e1bf7d645b8 Author: Tupone Alfredo gentoo org> AuthorDate: Sun May 7 20:20:50 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun May 7 20:20:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c36f364e dev-ada/gprbuild: Add dev-ada/gprbuild- Package-Manager: Portage-2.3.5, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild--gentoo.patch | 44 + dev-ada/gprbuild/gprbuild-2016.ebuild | 7 +-- .../{gprbuild-2016.ebuild => gprbuild-.ebuild} | 55 -- 3 files changed, 76 insertions(+), 30 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild--gentoo.patch b/dev-ada/gprbuild/files/gprbuild--gentoo.patch new file mode 100644 index 000..bebe795de96 --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild--gentoo.patch @@ -0,0 +1,44 @@ +--- gprbuild-/Makefile.old 2017-05-07 09:46:00.002669301 +0200 gprbuild-/Makefile 2017-05-07 09:47:37.832171592 +0200 +@@ -74,7 +74,8 @@ + CLEANER=gprclean -q $(RBD) + + GPRBUILD_BUILDER=$(BUILDER) $(GPRBUILD_GPR) \ +- -XLIBRARY_TYPE=static -XXMLADA_BUILD=static ++ -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \ ++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) + LIBGPR_BUILDER=$(BUILDER) $(GPR_GPR) + LIBGPR_INSTALLER=$(LIB_INSTALLER) $(GPR_GPR) -XBUILD=${BUILD} \ + --install-name=gpr --build-var=LIBRARY_TYPE $(GTARGET) +@@ -136,15 +136,18 @@ + + libgpr.build.shared: + ${BUILDER} -XLIBRARY_TYPE=relocatable \ +- -XXMLADA_BUILD=relocatable $(GPR_GPR) ++ -XXMLADA_BUILD=relocatable $(GPR_GPR) \ ++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) + + libgpr.build.static: + ${BUILDER} -XLIBRARY_TYPE=static \ +- -XXMLADA_BUILD=static $(GPR_GPR) ++ -XXMLADA_BUILD=static $(GPR_GPR) \ ++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) + + libgpr.build.static-pic: + ${BUILDER} -XLIBRARY_TYPE=static-pic \ +- -XXMLADA_BUILD=static-pic $(GPR_GPR) ++ -XXMLADA_BUILD=static-pic $(GPR_GPR) \ ++ -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) + + libgpr.install: libgpr.uninstall $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) + +--- gprbuild-/gpr/gpr.gpr.old 2017-05-07 10:00:30.688087076 +0200 gprbuild-/gpr/gpr.gpr 2017-05-07 10:00:45.028863862 +0200 +@@ -67,6 +67,7 @@ + for Switches ("gpr*.ad?") use + Compiler'Default_Switches ("Ada") & ("-g1"); + end case; ++ for Driver ("C") use External ("CC", "gcc"); +end Compiler; + + end GPR; diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index 23de5cb3e94..b021ddc6047 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -32,12 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) pkg_setup() { GCC=${ADA:-$(tc-getCC)} - local base=$(basename ${GCC}) - GNATMAKE="${base/gcc/gnatmake}" - if [[ ${base} != ${GCC} ]] ; then - local path=$(dirname ${GCC}) - GNATMAKE="${path}/${GNATMAKE}" - fi + GNATMAKE="${GCC/gcc/gnatmake}" if [[ -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" diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-.ebuild similarity index 72% copy from dev-ada/gprbuild/gprbuild-2016.ebuild copy to dev-ada/gprbuild/gprbuild-.ebuild index 23de5cb3e94..39a26f1a7e4 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-.ebuild @@ -3,41 +3,34 @@ EAPI=6 -inherit toolchain-funcs multiprocessing +inherit git-r3 toolchain-funcs multiprocessing MYP=${PN}-gpl-${PV} DESCRIPTION="Multi-Language Management" HOMEPAGE="http://libre.adacore.com/; SRC_URI=" - http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 - -> ${MYP}-src.tar.gz bootstrap? ( http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 - -> xmlada-gpl-${PV}-src.tar.gz )" + -> xmlada-gpl-2016-src.tar.gz )" +EGIT_REPO_URI="https://github.com/AdaCore/gprbuild.git; LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="" IUSE="bootstrap +shared static static-pic" DEPEND="dev-lang/gnat-gpl + >=dev-python/sphinx-1.5.2 !bootstrap? ( dev-ada/xmlada )" RDEPEND="${DEPEND}" -S="${WORKDIR}"/${MYP}-src - REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) pkg_setup() { GCC=${ADA:-$(tc-getCC)} - local base=$(basename ${GCC}) - GNATMAKE="${base/gcc/gnatmake}" - if [[ ${base} != ${GCC} ]] ; then - local path=$(dirname ${GCC}) -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: eea7d5c63db98060b8faaef0bca99b13101b3b9e Author: Tupone Alfredo gentoo org> AuthorDate: Thu Mar 30 19:10:43 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Mar 30 19:10:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea7d5c6 dev-ada/gprbuild: Fix documentation directories Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ada/gprbuild/gprbuild-2016.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index 2fe32aa1093..23de5cb3e94 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -96,6 +96,9 @@ src_install() { emake DESTDIR="${D}" libgpr.install.${kind} fi done + mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die + mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF} || die + rmdir "${D}"/usr/share/doc/${PN} || die fi einstalldocs }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 46dba86bc79018ffa1157f9f06e598de481ebb66 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Mar 29 19:27:24 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Mar 29 19:27:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46dba86b dev-ada/gprbuild: Now that dev-ada/xmlada is in, use it to build Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 54 + dev-ada/gprbuild/gprbuild-2016.ebuild | 74 +++ dev-ada/gprbuild/metadata.xml | 11 +++- 3 files changed, 113 insertions(+), 26 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index 952c2c0a69d..f3566e87adb 100644 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -160,3 +160,57 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu +pragma Convention (C, Sigint_Intercepted); +-- Called when the program is interrupted by Ctrl-C to delete the +-- temporary mapping files and configuration pragmas files. +--- gprbuild-gpl-2016-src/Makefile.in.old 2017-01-19 19:52:41.242907252 +0100 gprbuild-gpl-2016-src/Makefile.in 2017-01-19 19:54:45.822646333 +0100 +@@ -25,12 +25,12 @@ + host=@host@ + target=@target@ + build=@build@ +-prefix=@prefix@ ++prefix=$(DESTDIR)@prefix@ + srcdir=@srcdir@ + objdir=@objdir@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +-datadir=@datadir@ ++datadir=$(DESTDIR)@datadir@ + bindir=@bindir@ + libdir=@libdir@ + libexecdir=@libexecdir@ +@@ -66,7 +66,7 @@ + .PHONY: all distall gprbuild gprconfig gprclean gprinstall gprname gprls + + all: +- $(GPRBUILD_BUILDER) ++ $(GPRBUILD_BUILDER) -cargs:C $(CFLAGS) -cargs:Ada $(ADAFLAGS) + + distall: all install install.dist + +@@ -173,13 +173,13 @@ + libgpr.build: $(foreach t, $(LIBGPR_TYPES), libgpr.build.$(t)) + + libgpr.build.shared: +- ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr ++ ${BUILDER} -XLIBRARY_TYPE=relocatable -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) + + libgpr.build.static: +- ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr ++ ${BUILDER} -XLIBRARY_TYPE=static -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) + + libgpr.build.static-pic: +- ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr ++ ${BUILDER} -XLIBRARY_TYPE=static-pic -P$(srcdir)/gpr/gpr.gpr -cargs:Ada $(ADAFLAGS) + + libgpr.install: $(foreach t, $(LIBGPR_TYPES), libgpr.install.$(t)) + +--- gprbuild-gpl-2015-src/gprbuild.gpr.old 2017-01-11 21:44:59.795997896 +0100 gprbuild-gpl-2015-src/gprbuild.gpr 2017-01-11 21:45:07.971998651 +0100 +@@ -66,6 +66,7 @@ + for Switches ("gpr*.ad?") use + Compiler'Default_Switches ("Ada") & ("-g1"); + end case; ++ for Driver ("C") use External ("CC", "gcc"); +end Compiler; + +package Binder is + make BUILDER="$(BUILDER)" BUILD="$(BUILD)" diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild index 03d3c2baa53..2fe32aa1093 100644 --- a/dev-ada/gprbuild/gprbuild-2016.ebuild +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -12,19 +12,22 @@ HOMEPAGE="http://libre.adacore.com/; SRC_URI=" http://mirrors.cdn.adacore.com/art/57399662c7a447658e0affa8 -> ${MYP}-src.tar.gz - http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 - -> xmlada-gpl-${PV}-src.tar.gz" + bootstrap? ( + http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 + -> xmlada-gpl-${PV}-src.tar.gz )" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" +IUSE="bootstrap +shared static static-pic" -DEPEND="dev-lang/gnat-gpl" +DEPEND="dev-lang/gnat-gpl + !bootstrap? ( dev-ada/xmlada )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP}-src +REQUIRED_USE="bootstrap? ( !shared !static !static-pic )" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) pkg_setup() { @@ -44,34 +47,55 @@ pkg_setup() { } src_configure() { - : + if ! use bootstrap ; then + default + fi } bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" lib_progs="gprlib gprbind" src_compile() { - 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} 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)
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/, dev-ada/gprbuild/files/
commit: 5aba73dd0d66c48ba20fc55151156ca1492c4549 Author: Tupone Alfredo gentoo org> AuthorDate: Tue Mar 28 07:40:26 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Mar 28 07:41:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aba73dd dev-ada/gprbuild: Fix executable stack Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 162 ++ dev-ada/gprbuild/gprbuild-2016.ebuild | 8 +- 2 files changed, 167 insertions(+), 3 deletions(-) diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch new file mode 100644 index 000..952c2c0a69d --- /dev/null +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch @@ -0,0 +1,162 @@ +diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-main.adb gprbuild-gpl-2016-src/src/gprbuild-main.adb +--- gprbuild-gpl-2016-src.old/src/gprbuild-main.adb2017-03-28 09:12:24.205058242 +0200 gprbuild-gpl-2016-src/src/gprbuild-main.adb2017-03-28 09:21:20.495344963 +0200 +@@ -52,7 +52,8 @@ + with GPR.Tempdir;use GPR.Tempdir; + with GPR.Tree; use GPR.Tree; + with GPR.Util; use GPR.Util; ++with Gprbuild.Sigint_Intercepted; + + procedure Gprbuild.Main is + +use Stamps; +@@ -124,11 +124,6 @@ +pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler"); +-- Called by Gnatmake to install the SIGINT handler below + +- procedure Sigint_Intercepted; +- pragma Convention (C, Sigint_Intercepted); +- -- Called when the program is interrupted by Ctrl-C to delete the +- -- temporary mapping files and configuration pragmas files. +- +No_Object_Check_Switch : constant String := "--no-object-check"; +Direct_Import_Only_Switch : constant String := "--direct-import-only"; +Indirect_Imports_Switch: constant String := "--indirect-imports"; +@@ -1616,22 +1611,6 @@ + end if; +end Scan_Arg; + +- +- -- Sigint_Intercepted -- +- +- +- procedure Sigint_Intercepted is +- begin +- Put_Line ("*** Interrupted ***"); +- Delete_All_Temp_Files (Project_Tree.Shared); +- +- if Distributed_Mode then +- Compilation.Slave.Unregister_Remote_Slaves (From_Signal => True); +- end if; +- +- OS_Exit (1); +- end Sigint_Intercepted; +- + +-- Initialize -- + +@@ -2293,7 +2272,7 @@ + +-- And install Ctrl-C handler + +- Install_Int_Handler (Sigint_Intercepted'Unrestricted_Access); ++ Install_Int_Handler (Gprbuild.Sigint_Intercepted'Unrestricted_Access); + +-- Check command line arguments. These will be overridden when looking +-- for the configuration file +diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb +--- gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.adb 1970-01-01 01:00:00.0 +0100 gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.adb 2017-03-28 09:20:00.661792854 +0200 +@@ -0,0 +1,20 @@ ++ ++-- Sigint_Intercepted -- ++ ++ ++with Ada.Text_IO; use Ada.Text_IO; ++with Gpr_Util; use Gpr_Util; ++with Gprbuild.Compile; ++with Gprbuild.Compilation.Slave; ++ ++procedure Gprbuild.Sigint_Intercepted is ++begin ++ Put_Line ("*** Interrupted ***"); ++ Delete_All_Temp_Files (Project_Tree.Shared); ++ ++ if Distributed_Mode then ++ Compilation.Slave.Unregister_Remote_Slaves (From_Signal => True); ++ end if; ++ ++ OS_Exit (1); ++end Gprbuild.Sigint_Intercepted; +diff -Naur gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.ads gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.ads +--- gprbuild-gpl-2016-src.old/src/gprbuild-sigint_intercepted.ads 1970-01-01 01:00:00.0 +0100 gprbuild-gpl-2016-src/src/gprbuild-sigint_intercepted.ads 2017-03-28 09:15:35.275616543 +0200 +@@ -0,0 +1,4 @@ ++procedure Gprbuild.Sigint_Intercepted; ++pragma Convention (C, Sigint_Intercepted); ++-- Called when the program is interrupted by Ctrl-C to delete the ++-- temporary mapping files and configuration pragmas files. +diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-main.adb gprbuild-gpl-2016-src/src/gprinstall-main.adb +--- gprbuild-gpl-2016-src.old/src/gprinstall-main.adb 2017-03-28 09:12:24.205058242 +0200 gprbuild-gpl-2016-src/src/gprinstall-main.adb 2017-03-28 09:25:36.515709886 +0200 +@@ -42,6 +42,7 @@ + with Gprinstall.DB; + with Gprinstall.Install; + with Gprinstall.Uninstall; ++with Gprinstall.Sigint_Intercepted; + + procedure Gprinstall.Main is + +@@ -94,11 +94,6 @@ +pragma Import (C, Install_Int_Handler, "__gnat_install_int_handler"); +-- Called by Gnatmake to install the SIGINT handler below + +-
[gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/
commit: dbe528377cf440332a02314b984c0e3741f4a039 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Mar 22 20:53:46 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Mar 22 20:54:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe52837 dev-ada/gprbuild: Add gprbuild-gpl-2016 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-ada/gprbuild/Manifest | 2 + dev-ada/gprbuild/gprbuild-2016.ebuild | 75 +++ dev-ada/gprbuild/metadata.xml | 11 + 3 files changed, 88 insertions(+) diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest new file mode 100644 index 000..1642070972e --- /dev/null +++ b/dev-ada/gprbuild/Manifest @@ -0,0 +1,2 @@ +DIST gprbuild-gpl-2016-src.tar.gz 2142261 SHA256 d51659454bc0aaf1a9a9f1d05aab469a1f3d900065a4542123d3a59ab067275d SHA512 6b9e00248aaee90f3c00e7ce442c2b551b8532ec4d94a4471858d117feb27e91fd6d218995d4b71ee3f1f0677e9547d562fc2cda9ba80c3f6eb8d840ed56eb7e WHIRLPOOL 2afb9d3188f9498cf9cf9a6605081e27a843a15e4c4d5541616b8818757c6f8d458e8d6fbe97bcfc0607ac98d58ec2e4830d17aefd26458b3adcf1489a646945 +DIST xmlada-gpl-2016-src.tar.gz 1440671 SHA256 ea64d8da2c5fb01a257fc5bf474b8d4ec40b01dc15b320b9fe260ff2db668ba4 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 WHIRLPOOL b6ebb927d801394ad0b62d9538142c420ab33627582059466d4f64b12c3a45b1b5b489019aef715a59101370220a78507fe03d97c9e67233dfcc4f3aad1f16d7 diff --git a/dev-ada/gprbuild/gprbuild-2016.ebuild b/dev-ada/gprbuild/gprbuild-2016.ebuild new file mode 100644 index 000..57eee67bea6 --- /dev/null +++ b/dev-ada/gprbuild/gprbuild-2016.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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/57399662c7a447658e0affa8 + -> ${MYP}-src.tar.gz + http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 + -> xmlada-gpl-${PV}-src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="dev-lang/gnat-gpl" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +pkg_setup() { + GCC=${ADA:-$(tc-getCC)} + local base=$(basename ${GCC}) + GNATMAKE="${base/gcc/gnatmake}" + if [[ ${base} != ${GCC} ]] ; then + local path=$(dirname ${GCC}) + GNATMAKE="${path}/${GNATMAKE}" + fi + if [[ -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 ADA=gcc-4.9.4 in make.conf" + die "ada compiler not available" + fi +} + +src_configure() { + : +} + +bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls" +lib_progs="gprlib gprbind" + +src_compile() { + 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} src/gpr_imports.c -o gpr_imports.o + for bin in ${bin_progs}; do + ${GNATMAKE} -j$(makeopts_jobs) ${incflags} $ADAFLAGS ${bin}-main \ + -o ${bin} -largs gpr_imports.o + done + for lib in $lib_progs; do + ${GNATMAKE} -j$(makeopts_jobs) ${incflags} ${lib} $ADAFLAGS \ + -largs gpr_imports.o + done +} + +src_install() { + dobin ${bin_progs} + insinto /usr/share/gprconfig + exeinto /usr/libexec/gprbuild + doexe ${lib_progs} + doins share/gprconfig/*.xml + insinto /usr/share/gpr + doins share/_default.gpr +} diff --git a/dev-ada/gprbuild/metadata.xml b/dev-ada/gprbuild/metadata.xml new file mode 100644 index 000..d39fc81d0dd --- /dev/null +++ b/dev-ada/gprbuild/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + tup...@gentoo.org + Tupone Alfredo + + + GPRbuild is an advanced software tool designed to help automate the construction of multi-language systems. It removes complexity from multi-language development by allowing developers to quickly and easily compile and link software written in a combination of languages including Ada, Assembler, C, C++, and Fortran. Easily extendable by users to cover new toolchains and languages it is primarily aimed at projects of all sizes organized into subsystems and libraries and is particularly well-suited for compiled languages. + +