dev-ada/gnat_util: Remove old version

Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
This commit is contained in:
Tupone Alfredo
2018-11-18 22:09:27 +01:00
parent aa34b0bb76
commit 38a3cb7e85
5 changed files with 7 additions and 179 deletions

View File

@@ -1,3 +1,2 @@
DIST gnat_util-gpl-2016-src.tar.gz 1126296 BLAKE2B e1e7c2628b6a012ca3ad5809d4ea785a9fa68ed5e7f67a80475ece80161f53d611eb9a383591167d30f2a1125de48299123cc0c0b4807b6bcb4bca197bda78ed SHA512 1edb67e762637e9e951356c7be402d7b2b903a05abdc93eadaf5ba98bc7bfa936b4fa2a2ae7eb986200dec755020e53d312d42769512fba2e290099f6030bbd0
DIST gnat_util-gpl-2017-src.tar.gz 868496 BLAKE2B d105a59f0533428a4d57b3c81c0818f4d1bd457b113d775fe97f35f7352e03b602ac0e6d7b970e408fb3dd6d30f0d4e60feffccf42dbdc0723a76855b0164ee0 SHA512 d5e48c6fafc870f36094d2dfd5f45f2d5b5729c97596afff7475b7838c1c7c029ef57395ca1011ee74d8a4195597ea1f502732e654a02561a7abc72c8a7d3a6a
DIST gnat_util-gpl-2018-src.tar.gz 883945 BLAKE2B e30ee379f4ea9525337b0794d4fc91c80458b3b1dd3d10cbc455c6f566d4d073b6753c171ffbbabd85995717de249cdee7c094b7ba00d752a13e18d0f54da192 SHA512 490b0fa944f4b9fee2a4e78c1181658eb8f95262314455c41beb3ebe9db5dd540090d1f9840357572969721966fa11085dc680f3498dc539631ef3f4dbf56426

View File

@@ -1,100 +0,0 @@
--- gnat_util-gpl-2014-src/Makefile.old 2016-12-28 09:56:49.378950217 +0100
+++ gnat_util-gpl-2014-src/Makefile 2016-12-28 09:57:12.301562519 +0100
@@ -19,17 +19,26 @@
MKDIR=mkdir -p
SRC=gen_src
-.PHONY: all
-all: generate_sources
+build-static:
${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- -XLIBRARY_TYPE=static -Pgnat_util -p
+ -XLIBRARY_TYPE=static -Pgnat_util -p \
+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
-ifeq ($(ENABLE_SHARED), yes)
+build-shared:
${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- -XLIBRARY_TYPE=relocatable -Pgnat_util -p
+ -XLIBRARY_TYPE=relocatable -Pgnat_util -p \
+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
-endif
-ifeq ($(ENABLE_PIC), yes)
+build-static-pic:
${BUILDER} -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
- -XLIBRARY_TYPE=static-pic -Pgnat_util -p
+ -XLIBRARY_TYPE=static-pic -Pgnat_util -p \
+ -cargs:ada $(ADAFLAGS) -cargs:C $(CFLAGS)
+.PHONY: all
+all: generate_sources
+ $(MAKE) build-static
+ifeq ($(ENABLE_SHARED), yes)
+ $(MAKE) build-shared
+endif
+ifeq ($(ENABLE_PIC), yes)
+ $(MAKE) build-static-pic
endif
.PHONY: generate_sources
@@ -48,7 +48,7 @@
$(MKDIR) $(SRC)
$(CP) xsnamest.adb xutil.* snames.adb-tmpl snames.ads-tmpl snames.h-tmpl $(SRC)
(cd $(SRC) && \
- gnatmake -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
+ ${GNATMAKE} -gnatf -gnatwae -gnatyg -gnatyS xsnamest && \
./xsnamest && mv snames.ns snames.ads && mv snames.nb snames.adb)
$(CP) sdefault_adb.gnat_util $(SRC)/sdefault.adb
@@ -58,8 +58,7 @@
--prefix=$(prefix) --project-subdir=lib/gnat gnat_util
endif
-.PHONY: install
-install: install-clean
+install-static:
${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-XLIBRARY_TYPE=static \
--prefix=$(prefix) \
@@ -67,7 +66,7 @@
--lib-subdir=lib/gnat_util/static \
--project-subdir=lib/gnat \
--build-var=LIBRARY_TYPE --build-name=static -Pgnat_util
-ifeq ($(ENABLE_SHARED), yes)
+install-shared:
${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-XLIBRARY_TYPE=relocatable \
--prefix=$(prefix) \
@@ -75,8 +74,7 @@
--lib-subdir=lib/gnat_util/relocatable \
--project-subdir=lib/gnat \
--build-var=LIBRARY_TYPE --build-name=relocatable -Pgnat_util
-endif
-ifeq ($(ENABLE_PIC), yes)
+install-static-pic:
${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-XLIBRARY_TYPE=static-pic \
--prefix=$(prefix) \
@@ -84,6 +82,14 @@
--lib-subdir=lib/gnat_util/static-pic \
--project-subdir=lib/gnat \
--build-var=LIBRARY_TYPE --build-name=static-pic -Pgnat_util
+.PHONY: install
+install: install-clean
+ $(MAKE) install-static
+ifeq ($(ENABLE_SHARED), yes)
+ $(MAKE) install-shared
+endif
+ifeq ($(ENABLE_PIC), yes)
+ $(MAKE) install-static-pic
endif
.PHONY: clean
--- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100
+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100
@@ -31,6 +31,7 @@
for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata");
for Default_Switches ("C") use ("-g");
end case;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
package Builder is

View File

@@ -68,13 +68,3 @@
${INSTALLER} -p -f -m -XOS=$(OS_TYPE) -XBUILD=$(BUILD_TYPE) \
-XLIBRARY_TYPE=static-pic \
--prefix=$(prefix) \
--- gnat_util-gpl-2016-src/gnat_util.gpr.old 2017-02-09 22:15:27.153827164 +0100
+++ gnat_util-gpl-2016-src/gnat_util.gpr 2017-02-09 22:15:38.307627480 +0100
@@ -31,6 +31,7 @@
for Default_Switches ("Ada") use ("-O0", "-gnato", "-g", "-gnata");
for Default_Switches ("C") use ("-g");
end case;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
package Builder is

View File

@@ -1,61 +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}
DESCRIPTION="Provides access to GNAT compiler internals for AdaCore utilities"
HOMEPAGE="http://libre.adacore.com"
SRC_URI="http://mirrors.cdn.adacore.com/art/57399637c7a447658e0affa6
-> ${MYP}-src.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+gnat_2016 gnat_2017 +shared static-libs static-pic"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
if use gnat_2016; then
GCC_PV=4.9.4
else
GCC_PV=6.3.0
fi
GCC=${CHOST}-gcc-${GCC_PV}
GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
if use static-libs; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
fi
for kind in shared static-pic; do
if use ${kind}; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
build-${kind}
fi
done
}
src_install() {
if use static-libs; then
emake prefix="${D}"/usr install-static
fi
for kind in shared static-pic; do
if use ${kind}; then
emake prefix="${D}"/usr install-${kind}
fi
done
einstalldocs
}

View File

@@ -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
@@ -17,10 +17,11 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="gnat_2016 +gnat_2017 +shared static-libs static-pic"
RDEPEND="dev-lang/gnat-gpl:6.3.0"
RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2017]"
REQUIRED_USE="!gnat_2016 gnat_2017"
dev-ada/gprbuild[gnat_2016=,gnat_2017=]"
REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
S="${WORKDIR}"/${MYP}-src
@@ -32,16 +33,15 @@ src_compile() {
else
GCC_PV=6.3.0
fi
GCC=${CHOST}-gcc-${GCC_PV}
GNATMAKE=${CHOST}-gnatmake-${GCC_PV}
emake GNATMAKE="${GNATMAKE} ${ADAFLAGS}" \
BUILDER="gprbuild -j$(makeopts_jobs)" generate_sources
if use static-libs; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
emake BUILDER="gprbuild -v -j$(makeopts_jobs)" build-static
fi
for kind in shared static-pic; do
if use ${kind}; then
emake CC="${GCC}" BUILDER="gprbuild -v -j$(makeopts_jobs)" \
emake BUILDER="gprbuild -v -j$(makeopts_jobs)" \
build-${kind}
fi
done