public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2022-12-16 12:51 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2022-12-16 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9ff3f375bec4c5ba929ecef2d4f6e5d5761faf3f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 12:51:06 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 12:51:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff3f375

dev-ada/gpr: new package, add 23.0.0

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/Manifest          |  1 +
 dev-ada/gpr/gpr-23.0.0.ebuild | 65 +++++++++++++++++++++++++++++++++++++++++++
 dev-ada/gpr/metadata.xml      | 13 +++++++++
 3 files changed, 79 insertions(+)

diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
new file mode 100644
index 000000000000..88e120143e4d
--- /dev/null
+++ b/dev-ada/gpr/Manifest
@@ -0,0 +1 @@
+DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B 475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b SHA512 f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc

diff --git a/dev-ada/gpr/gpr-23.0.0.ebuild b/dev-ada/gpr/gpr-23.0.0.ebuild
new file mode 100644
index 000000000000..e00053c0067c
--- /dev/null
+++ b/dev-ada/gpr/gpr-23.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+PYTHON_COMPAT=( python3_{6,7,8,9,10,11} pypy3 )
+
+inherit python-any-r1 ada multiprocessing
+
+DESCRIPTION="LibGPR2 - Parser for GPR Project files"
+HOMEPAGE="https://github.com/AdaCore/gpr"
+SRC_URI="https://github.com/AdaCore/gpr/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP}]
+	shared? ( dev-ada/xmlada[shared,static-pic] )
+	dev-ada/gnatcoll-core[${ADA_USEDEP}]
+	shared? ( dev-ada/gnatcoll-core[shared,static-pic] )
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp]
+	shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )"
+
+DEPEND="${RDEPEND}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-ada/langkit[${PYTHON_USEDEP}]
+	')"
+
+IUSE="+shared"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+python_check_deps() {
+	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	emake PROCESSORS=$(makeopts_jobs) \
+		GPR2KBDIR=/usr/share/gprconfig \
+		ENABLE_SHARED=$(usex shared true false) \
+		setup
+}
+
+src_compile() {
+	emake GPRBUILD_OPTIONS=-v
+}
+
+src_install() {
+	emake install \
+		prefix="${D}"/usr
+	einstalldocs
+
+	rm "${D}"/usr/bin/gprclean || die
+	rm "${D}"/usr/bin/gprconfig || die
+	rm "${D}"/usr/bin/gprinstall || die
+	rm "${D}"/usr/bin/gprls || die
+	rm "${D}"/usr/bin/gprname || die
+}

diff --git a/dev-ada/gpr/metadata.xml b/dev-ada/gpr/metadata.xml
new file mode 100644
index 000000000000..51966a8cdf1e
--- /dev/null
+++ b/dev-ada/gpr/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="shared">Build shared library</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">AdaCore/gpr</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2022-12-17 13:48 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2022-12-17 13:48 UTC (permalink / raw
  To: gentoo-commits

commit:     624808861d5aa2943ae25da94db559bb65b2fba5
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 13:47:02 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 13:47:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62480886

dev-ada/gpr: disable py3.6, py3.7, pypy3

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/gpr-23.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0.ebuild b/dev-ada/gpr/gpr-23.0.0.ebuild
index e00053c0067c..dcb73663e471 100644
--- a/dev-ada/gpr/gpr-23.0.0.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0.ebuild
@@ -4,13 +4,13 @@
 EAPI=7
 
 ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-PYTHON_COMPAT=( python3_{6,7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-any-r1 ada multiprocessing
 
 DESCRIPTION="LibGPR2 - Parser for GPR Project files"
 HOMEPAGE="https://github.com/AdaCore/gpr"
-SRC_URI="https://github.com/AdaCore/gpr/archive/refs/tags/v${PV}.tar.gz
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2022-12-17 20:59 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2022-12-17 20:59 UTC (permalink / raw
  To: gentoo-commits

commit:     2e0541dec77c8adb5b7f2dd296337922c9e920c3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 20:59:08 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 20:59:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e0541de

dev-ada/gpr: fix shared

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/{gpr-23.0.0.ebuild => gpr-23.0.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ada/gpr/gpr-23.0.0.ebuild b/dev-ada/gpr/gpr-23.0.0-r1.ebuild
similarity index 97%
rename from dev-ada/gpr/gpr-23.0.0.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r1.ebuild
index dcb73663e471..18d10335b4e3 100644
--- a/dev-ada/gpr/gpr-23.0.0.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r1.ebuild
@@ -44,7 +44,7 @@ python_check_deps() {
 src_configure() {
 	emake PROCESSORS=$(makeopts_jobs) \
 		GPR2KBDIR=/usr/share/gprconfig \
-		ENABLE_SHARED=$(usex shared true false) \
+		ENABLE_SHARED=$(usex shared) \
 		setup
 }
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-03-21  7:25 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-03-21  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d092fc434912733ae0193a8db4d92055dbea40f9
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 07:18:30 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 07:18:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d092fc43

dev-ada/gpr: gcc_12, EAPI8

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/{gpr-23.0.0-r1.ebuild => gpr-23.0.0-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r1.ebuild b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
similarity index 96%
rename from dev-ada/gpr/gpr-23.0.0-r1.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r2.ebuild
index 0d5a9aca1198..34bdf5824209 100644
--- a/dev-ada/gpr/gpr-23.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit python-any-r1 ada multiprocessing


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-03-21 21:02 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-03-21 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4b116fc63f72eba7aedd207c7d4ad47150018363
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 20:56:38 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 21:00:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b116fc6

dev-ada/gpr: drop gcc_12_2_0

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/gpr-23.0.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r2.ebuild b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
index 34bdf5824209..ce0429b7f624 100644
--- a/dev-ada/gpr/gpr-23.0.0-r2.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
+ADA_COMPAT=( gnat_2021 gcc_12 )
 PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit python-any-r1 ada multiprocessing


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-05-22 19:23 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-05-22 19:23 UTC (permalink / raw
  To: gentoo-commits

commit:     129ee4c06245a78f8a567c35658279d00fa7e136
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 19:05:02 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon May 22 19:22:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129ee4c0

dev-ada/gpr: static-libs and static-pic control generation of .a files

Closes: https://bugs.gentoo.org/902535
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/gpr-23.0.0-r2.ebuild |  65 ----------------------
 dev-ada/gpr/gpr-23.0.0-r3.ebuild | 113 +++++++++++++++++++++++++++++++++++++++
 dev-ada/gpr/metadata.xml         |   1 +
 3 files changed, 114 insertions(+), 65 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r2.ebuild b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
deleted file mode 100644
index ce0429b7f624..000000000000
--- a/dev-ada/gpr/gpr-23.0.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-PYTHON_COMPAT=( python3_{9,10,11} )
-
-inherit python-any-r1 ada multiprocessing
-
-DESCRIPTION="LibGPR2 - Parser for GPR Project files"
-HOMEPAGE="https://github.com/AdaCore/gpr"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP}]
-	shared? ( dev-ada/xmlada[shared,static-pic] )
-	dev-ada/gnatcoll-core[${ADA_USEDEP}]
-	shared? ( dev-ada/gnatcoll-core[shared,static-pic] )
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp]
-	shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )"
-
-DEPEND="${RDEPEND}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-ada/langkit[${PYTHON_USEDEP}]
-	')"
-
-IUSE="+shared"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-python_check_deps() {
-	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	emake PROCESSORS=$(makeopts_jobs) \
-		GPR2KBDIR=/usr/share/gprconfig \
-		ENABLE_SHARED=$(usex shared) \
-		setup
-}
-
-src_compile() {
-	emake GPRBUILD_OPTIONS=-v
-}
-
-src_install() {
-	emake install \
-		prefix="${D}"/usr
-	einstalldocs
-
-	rm "${D}"/usr/bin/gprclean || die
-	rm "${D}"/usr/bin/gprconfig || die
-	rm "${D}"/usr/bin/gprinstall || die
-	rm "${D}"/usr/bin/gprls || die
-	rm "${D}"/usr/bin/gprname || die
-}

diff --git a/dev-ada/gpr/gpr-23.0.0-r3.ebuild b/dev-ada/gpr/gpr-23.0.0-r3.ebuild
new file mode 100644
index 000000000000..5ac3ae0f761c
--- /dev/null
+++ b/dev-ada/gpr/gpr-23.0.0-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ADA_COMPAT=( gnat_2021 gcc_12 )
+PYTHON_COMPAT=( python3_{9,10,11} )
+
+inherit python-any-r1 ada multiprocessing
+
+DESCRIPTION="LibGPR2 - Parser for GPR Project files"
+HOMEPAGE="https://github.com/AdaCore/gpr"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP}]
+	shared? ( dev-ada/xmlada[shared,static-pic] )
+	dev-ada/gnatcoll-core[${ADA_USEDEP}]
+	shared? ( dev-ada/gnatcoll-core[shared,static-pic] )
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp]
+	shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )"
+
+DEPEND="${RDEPEND}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+BDEPEND="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-ada/langkit[${PYTHON_USEDEP}]
+	')"
+
+python_check_deps() {
+	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
+}
+
+src_configure() {
+	emake ENABLE_SHARED=$(usex shared) setup
+}
+
+src_compile() {
+	build() {
+		gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 gpr2.gpr || die
+	}
+	mkdir -p .build/kb || die
+	gprbuild -p -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
+		--relocate-build-tree || die
+	.build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
+	emake -C langkit setup DEST="${S}/.build/lkparser"
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		libtype='static'
+	elif use static-pic; then
+		libtype='static-pic'
+	elif use shared; then
+		libtype='relocatable'
+	fi
+
+	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} gpr2-tools.gpr \
+		|| die
+	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		-XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr || die
+}
+
+src_install() {
+	build() {
+		gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 --build-name=$1 \
+			--build-var=LIBRARY_TYPE \
+			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		--build-name=${libtype} --mode=usage gpr2-tools.gpr || die
+	gprinstall -p -f -v -XGPR2_BUILD=release --prefix='${D}/usr' \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		-XLANGKIT_SUPPORT_BUILD=${libtype} --build-name=${libtype} \
+		--mode=usage gpr2-name.gpr || die
+
+	einstalldocs
+
+	rm "${D}"/usr/bin/gprclean || die
+	rm "${D}"/usr/bin/gprconfig || die
+	rm "${D}"/usr/bin/gprinstall || die
+	rm "${D}"/usr/bin/gprls || die
+}

diff --git a/dev-ada/gpr/metadata.xml b/dev-ada/gpr/metadata.xml
index 51966a8cdf1e..3551228a3310 100644
--- a/dev-ada/gpr/metadata.xml
+++ b/dev-ada/gpr/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<use>
 		<flag name="shared">Build shared library</flag>
+		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AdaCore/gpr</remote-id>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-05-23  5:28 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-05-23  5:28 UTC (permalink / raw
  To: gentoo-commits

commit:     7c489e51eda445f81e772bb2c287748e574879a5
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 05:27:06 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May 23 05:28:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c489e51

dev-ada/gpr: respect ADAFLAGS & LDFLAGS

Closes: https://bugs.gentoo.org/902529
Closes: https://bugs.gentoo.org/902531
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 .../{gpr-23.0.0-r3.ebuild => gpr-23.0.0-r4.ebuild}   | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r3.ebuild b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
similarity index 84%
rename from dev-ada/gpr/gpr-23.0.0-r3.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r4.ebuild
index 5ac3ae0f761c..a12a8c9c3b0f 100644
--- a/dev-ada/gpr/gpr-23.0.0-r3.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
@@ -46,13 +46,15 @@ src_configure() {
 }
 
 src_compile() {
-	build() {
-		gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 gpr2.gpr || die
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
 	}
 	mkdir -p .build/kb || die
-	gprbuild -p -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
-		--relocate-build-tree || die
+	gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
+		--relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
 	.build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
 	emake -C langkit setup DEST="${S}/.build/lkparser"
 	if use shared; then
@@ -81,10 +83,10 @@ src_compile() {
 }
 
 src_install() {
-	build() {
-		gprinstall -p -f -v -XGPR2_BUILD=release --prefix="${D}/usr" \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 --build-name=$1 \
-			--build-var=LIBRARY_TYPE \
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
+			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
 			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
 	}
 	if use shared; then


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-05-23 19:02 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-05-23 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b7627f7d9b794b1c42345616f8288d130e0e9727
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 19:01:11 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue May 23 19:01:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7627f7d

dev-ada/gpr: call python pkg_setup

Closes: https://bugs.gentoo.org/906971
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/gpr-23.0.0-r4.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r4.ebuild b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
index a12a8c9c3b0f..c56678a27149 100644
--- a/dev-ada/gpr/gpr-23.0.0-r4.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r4.ebuild
@@ -41,6 +41,11 @@ python_check_deps() {
 	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"
 }
 
+pkg_setup() {
+	ada_pkg_setup
+	python-any-r1_pkg_setup
+}
+
 src_configure() {
 	emake ENABLE_SHARED=$(usex shared) setup
 }
@@ -56,7 +61,7 @@ src_compile() {
 	gprbuild -p -v -P src/kb/collect_kb.gpr -XKB_BUILD_DIR=.build/kb \
 		--relocate-build-tree -largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
 	.build/kb/collect_kb -o .build/kb/config.kb /usr/share/gprconfig || die
-	emake -C langkit setup DEST="${S}/.build/lkparser"
+	emake -C langkit setup DEST="${S}/.build/lkparser" PYTHONEXE=${PYTHON}
 	if use shared; then
 		build relocatable
 	fi


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-05-24  5:34 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-05-24  5:34 UTC (permalink / raw
  To: gentoo-commits

commit:     cc974d70be053afdebbdf01808425b099b3f345b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 05:32:31 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed May 24 05:33:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc974d70

dev-ada/gpr: add libadalang dep

Closes: https://bugs.gentoo.org/902525
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/{gpr-23.0.0-r4.ebuild => gpr-23.0.0-r5.ebuild} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r4.ebuild b/dev-ada/gpr/gpr-23.0.0-r5.ebuild
similarity index 91%
rename from dev-ada/gpr/gpr-23.0.0-r4.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r5.ebuild
index c56678a27149..a34672aacd21 100644
--- a/dev-ada/gpr/gpr-23.0.0-r4.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r5.ebuild
@@ -21,12 +21,10 @@ REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
 
 RDEPEND="${ADA_DEPS}
-	dev-ada/xmlada[${ADA_USEDEP}]
-	shared? ( dev-ada/xmlada[shared,static-pic] )
-	dev-ada/gnatcoll-core[${ADA_USEDEP}]
-	shared? ( dev-ada/gnatcoll-core[shared,static-pic] )
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,gmp]
-	shared? ( dev-ada/gnatcoll-bindings[shared,static-pic] )"
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+"
 
 DEPEND="${RDEPEND}
 	dev-ada/gprconfig_kb[${ADA_USEDEP}]
@@ -35,7 +33,9 @@ DEPEND="${RDEPEND}
 BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep '
 		dev-ada/langkit[${PYTHON_USEDEP}]
-	')"
+	')
+	dev-ada/libadalang
+"
 
 python_check_deps() {
 	python_has_version "dev-ada/langkit[${PYTHON_USEDEP}]"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-05-25 16:01 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-05-25 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     9f2b43ad6b84f8631525ebc1dcf62d51b3e86bf1
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 16:00:28 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 25 16:01:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2b43ad

dev-ada/gpr: respect CFLAGS/LDFLAGS on tools too

Closes: https://bugs.gentoo.org/907055
Closes: https://bugs.gentoo.org/907056
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/gpr-23.0.0-r5.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r5.ebuild b/dev-ada/gpr/gpr-23.0.0-r5.ebuild
index a34672aacd21..aa11d9152470 100644
--- a/dev-ada/gpr/gpr-23.0.0-r5.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r5.ebuild
@@ -81,10 +81,11 @@ src_compile() {
 
 	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
 		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} gpr2-tools.gpr \
-		|| die
+		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
 	gprbuild -p -m -v -j$(makeopts_jobs) -XGPR2_BUILD=release \
 		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
-		-XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr || die
+		-XLANGKIT_SUPPORT_BUILD=${libtype} gpr2-name.gpr \
+		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2023-12-10 16:26 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2023-12-10 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d1d84597b107075cf1be8f8f4ce824be22e23e0f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 16:25:21 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 16:25:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1d84597

dev-ada/gpr: support gcc_13

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/{gpr-23.0.0-r5.ebuild => gpr-23.0.0-r6.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ada/gpr/gpr-23.0.0-r5.ebuild b/dev-ada/gpr/gpr-23.0.0-r6.ebuild
similarity index 98%
rename from dev-ada/gpr/gpr-23.0.0-r5.ebuild
rename to dev-ada/gpr/gpr-23.0.0-r6.ebuild
index aa11d9152470..d103fba9e4f2 100644
--- a/dev-ada/gpr/gpr-23.0.0-r5.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12 )
+ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
 PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit python-any-r1 ada multiprocessing


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/
@ 2024-03-17 18:41 Alfredo Tupone
  0 siblings, 0 replies; 12+ messages in thread
From: Alfredo Tupone @ 2024-03-17 18:41 UTC (permalink / raw
  To: gentoo-commits

commit:     cbd873a89daab26d2fa0c7c7ef18bdf68de192b7
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 18:40:30 2024 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 18:41:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd873a8

dev-ada/gpr: add 24.0.0

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ada/gpr/Manifest          |  1 +
 dev-ada/gpr/gpr-24.0.0.ebuild | 88 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index 88e120143e4d..426813aba4d8 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1 +1,2 @@
 DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B 475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b SHA512 f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc
+DIST gpr2-with-lkparser-24.0.tgz 2030278 BLAKE2B ae42fd876a08a654db2db919e6d777ba603d54d6db618e8b8dbdfcfd9313decad092e0a9feae09ca46ec324cd860eaffbb6fa670290d454414677ad7e4a61dc7 SHA512 eda3c693393763da31312733e2bc06e852b867a32b42da6afdddd623051a1d29f7243aabaef3ae50052b22686dce6db62d9823652ce516d79822e4215f4d87b1

diff --git a/dev-ada/gpr/gpr-24.0.0.ebuild b/dev-ada/gpr/gpr-24.0.0.ebuild
new file mode 100644
index 000000000000..b0b0a3b4d4e8
--- /dev/null
+++ b/dev-ada/gpr/gpr-24.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022-2024 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
+
+DESCRIPTION="LibGPR2 - Parser for GPR Project files"
+HOMEPAGE="https://github.com/AdaCore/gpr"
+SRC_URI="https://github.com/AdaCore/${PN}/releases/download/v${PV}/gpr2-with-lkparser-$(ver_cut 1-2).tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/xmlada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},shared?,static-libs?,static-pic?,iconv,gmp]
+"
+
+DEPEND="${RDEPEND}
+	dev-ada/gprconfig_kb[${ADA_USEDEP}]
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+S="${WORKDIR}"/${PN}
+
+src_compile() {
+	build () {
+		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
+			-XGPR2_BUILD=release -XXMLADA_BUILD=$1 gpr2.gpr \
+			-largs ${LDFLAGS} \
+			-cargs ${ADAFLAGS} || die "gprbuild failed"
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		libtype='static'
+	elif use static-pic; then
+		libtype='static-pic'
+	elif use shared; then
+		libtype='relocatable'
+	fi
+
+	gprbuild -p -m -v -j$(makeopts_jobs) -aP . -XGPR2_BUILD=release \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} tools/gpr2-tools.gpr \
+		-largs ${LDFLAGS} -cargs ${ADAFLAGS} || die
+}
+
+src_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -f -p -v -XGPR2_BUILD=release \
+			--prefix="${D}/usr" -XXMLADA_BUILD=$1 \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=GPR2_LIBRARY_TYPE gpr2.gpr || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	gprinstall -p -f -v -aP . -XGPR2_BUILD=release --prefix="${D}/usr" \
+		-XLIBRARY_TYPE=${libtype} -XXMLADA_BUILD=${libtype} \
+		--build-name=${libtype} --mode=usage tools/gpr2-tools.gpr || die
+
+	einstalldocs
+
+	rm "${D}"/usr/bin/gprclean || die
+	rm "${D}"/usr/bin/gprconfig || die
+	rm "${D}"/usr/bin/gprinstall || die
+	rm "${D}"/usr/bin/gprls || die
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-03-17 18:41 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-17 20:59 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gpr/ Alfredo Tupone
  -- strict thread matches above, loose matches on Subject: below --
2024-03-17 18:41 Alfredo Tupone
2023-12-10 16:26 Alfredo Tupone
2023-05-25 16:01 Alfredo Tupone
2023-05-24  5:34 Alfredo Tupone
2023-05-23 19:02 Alfredo Tupone
2023-05-23  5:28 Alfredo Tupone
2023-05-22 19:23 Alfredo Tupone
2023-03-21 21:02 Alfredo Tupone
2023-03-21  7:25 Alfredo Tupone
2022-12-17 13:48 Alfredo Tupone
2022-12-16 12:51 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox