[gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/ - gentoo-commits

From:	Alfredo Tupone <tupone@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/
Date:	Sun, 25 Feb 2018 14:26:30
Message-Id:	`1519568765.49a5b64a7413c71ef3c9e010be5f387e1425ada1.tupone@gentoo`

1

commit:     49a5b64a7413c71ef3c9e010be5f387e1425ada1

2

Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>

3

AuthorDate: Sun Feb 25 14:26:05 2018 +0000

4

Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>

5

CommitDate: Sun Feb 25 14:26:05 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a5b64a

7

8

dev-lang/gnat-gpl: Add ~x86 to 2016 version

9

10

Package-Manager: Portage-2.3.19, Repoman-2.3.6

11

12

 dev-lang/gnat-gpl/Manifest             |  1 +

13

 dev-lang/gnat-gpl/gnat-gpl-2016.ebuild | 35 ++++++++++++++++++++++++----------

14

 2 files changed, 26 insertions(+), 10 deletions(-)

15

16

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest

17

index f60bded56f3..0b0f6a1f33a 100644

18

--- a/dev-lang/gnat-gpl/Manifest

19

+++ b/dev-lang/gnat-gpl/Manifest

20

@@ -10,6 +10,7 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2

21

 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78

22

 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd

23

 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a

24

+DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2

25

 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e

26

 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8

27

 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098

28

29

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild

30

index cbbcdeca4f8..7015061fac2 100644

31

--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild

32

+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild

33

@@ -1,4 +1,4 @@

34

-# Copyright 1999-2017 Gentoo Foundation

35

+# Copyright 1999-2018 Gentoo Foundation

36

 # Distributed under the terms of the GNU General Public License v2

37

38

 EAPI="5"

39

@@ -25,6 +25,8 @@ inherit eutils toolchain-funcs toolchain

40

41

 REL=4.9

42

 MYP=gcc-${REL}-gpl-${PV}-src

43

+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin

44

+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin

45

46

 DESCRIPTION="GNAT Ada Compiler - GPL version"

47

 HOMEPAGE="http://libre.adacore.com/"

48

@@ -35,12 +37,20 @@ SRC_URI+="

49

 		-> ${MYP}.tar.gz

50

 	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d

51

 		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz

52

-	bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->

53

-		gnat-gpl-2014-x86_64-linux-bin.tar.gz )"

54

+	bootstrap? (

55

+		amd64? (

56

+			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->

57

+			${BTSTRP_AMD64}.tar.gz

58

+		)

59

+		x86? (

60

+			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->

61

+			${BTSTRP_X86}.tar.gz

62

+		)

63

+	)"

64

65

 LICENSE+=" GPL-2 GPL-3"

66

 SLOT="${TOOLCHAIN_GCC_PV}"

67

-KEYWORDS="amd64"

68

+KEYWORDS="amd64 ~x86"

69

 IUSE="bootstrap"

70

71

 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"

72

@@ -57,8 +67,13 @@ FSFGCC=gcc-${TOOLCHAIN_GCC_PV}

73

 pkg_setup() {

74

 	toolchain_pkg_setup

75

76

+	if use amd64; then

77

+		BTSTRP=${BTSTRP_AMD64}

78

+	else

79

+		BTSTRP=${BTSTRP_X86}

80

+	fi

81

 	if use bootstrap; then

82

-		GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc

83

+		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc

84

 	else

85

 		GCC=${ADA:-$(tc-getCC)}

86

fi

87

@@ -87,17 +102,17 @@ src_unpack() {

88

 		${FSFGCC}.tar.bz2

89

 		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"

90

 	if use bootstrap; then

91

-		GCC_A_FAKEIT="${GCC_A_FAKEIT} gnat-gpl-2014-x86_64-linux-bin.tar.gz"

92

+		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"

93

fi

94

95

 	toolchain_src_unpack

96

 	if use bootstrap; then

97

-		rm gnat-gpl-2014-x86_64-linux-bin/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld || die

98

+		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die

99

fi

100

}

101

102

 src_prepare() {

103

-	mv ../gnat-gpl-${PV}-src/src/ada gcc/ || die

104

+	mv ../${P}-src/src/ada gcc/ || die

105

 	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die

106

107

 	sed -i \

108

@@ -152,7 +167,7 @@ src_compile() {

109

 	toolchain_src_compile

110

 	gcc_do_make "-C gcc gnatlib-shared"

111

 	ln -s gcc ../build/prev-gcc || die

112

-	ln -s x86_64-pc-linux-gnu ../build/prev-x86_64-pc-linux-gnu || die

113

+	ln -s ${CHOST} ../build/prev-${CHOST} || die

114

 	gcc_do_make "-C gcc gnattools"

115

}

116

117

@@ -190,7 +205,7 @@ src_install() {

118

 pkg_postinst () {

119

 	toolchain_pkg_postinst

120

 	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"

121

-	einfo "Set the ADA variables to gcc-${TOOLCHAIN_GCC_PV} in your make.conf"

122

+	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"

123

 	einfo "Even if the c/c++ compilers are using almost the same patched"

124

 	einfo "source as the sys-devel/gcc package its use is not extensively"

125

 	einfo "tested, and not supported for updating your system, except for ada"

1	commit: 49a5b64a7413c71ef3c9e010be5f387e1425ada1
2	Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3	AuthorDate: Sun Feb 25 14:26:05 2018 +0000
4	Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5	CommitDate: Sun Feb 25 14:26:05 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a5b64a
7
8	dev-lang/gnat-gpl: Add ~x86 to 2016 version
9
10	Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12	dev-lang/gnat-gpl/Manifest \| 1 +
13	dev-lang/gnat-gpl/gnat-gpl-2016.ebuild \| 35 ++++++++++++++++++++++++----------
14	2 files changed, 26 insertions(+), 10 deletions(-)
15
16	diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
17	index f60bded56f3..0b0f6a1f33a 100644
18	--- a/dev-lang/gnat-gpl/Manifest
19	+++ b/dev-lang/gnat-gpl/Manifest
20	@@ -10,6 +10,7 @@ DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f2
21	DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
22	DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
23	DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
24	+DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
25	DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
26	DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
27	DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
28
29	diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
30	index cbbcdeca4f8..7015061fac2 100644
31	--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
32	+++ b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
33	@@ -1,4 +1,4 @@
34	-# Copyright 1999-2017 Gentoo Foundation
35	+# Copyright 1999-2018 Gentoo Foundation
36	# Distributed under the terms of the GNU General Public License v2
37
38	EAPI="5"
39	@@ -25,6 +25,8 @@ inherit eutils toolchain-funcs toolchain
40
41	REL=4.9
42	MYP=gcc-${REL}-gpl-${PV}-src
43	+BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
44	+BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
45
46	DESCRIPTION="GNAT Ada Compiler - GPL version"
47	HOMEPAGE="http://libre.adacore.com/"
48	@@ -35,12 +37,20 @@ SRC_URI+="
49	-> ${MYP}.tar.gz
50	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
51	-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
52	- bootstrap? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
53	- gnat-gpl-2014-x86_64-linux-bin.tar.gz )"
54	+ bootstrap? (
55	+ amd64? (
56	+ http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
57	+ ${BTSTRP_AMD64}.tar.gz
58	+ )
59	+ x86? (
60	+ http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
61	+ ${BTSTRP_X86}.tar.gz
62	+ )
63	+ )"
64
65	LICENSE+=" GPL-2 GPL-3"
66	SLOT="${TOOLCHAIN_GCC_PV}"
67	-KEYWORDS="amd64"
68	+KEYWORDS="amd64 ~x86"
69	IUSE="bootstrap"
70
71	RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
72	@@ -57,8 +67,13 @@ FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
73	pkg_setup() {
74	toolchain_pkg_setup
75
76	+ if use amd64; then
77	+ BTSTRP=${BTSTRP_AMD64}
78	+ else
79	+ BTSTRP=${BTSTRP_X86}
80	+ fi
81	if use bootstrap; then
82	- GCC="${WORKDIR}"/gnat-gpl-2014-x86_64-linux-bin/bin/gcc
83	+ GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
84	else
85	GCC=${ADA:-$(tc-getCC)}
86	fi
87	@@ -87,17 +102,17 @@ src_unpack() {
88	${FSFGCC}.tar.bz2
89	gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
90	if use bootstrap; then
91	- GCC_A_FAKEIT="${GCC_A_FAKEIT} gnat-gpl-2014-x86_64-linux-bin.tar.gz"
92	+ GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
93	fi
94
95	toolchain_src_unpack
96	if use bootstrap; then
97	- rm gnat-gpl-2014-x86_64-linux-bin/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \|\| die
98	+ rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld \|\| die
99	fi
100	}
101
102	src_prepare() {
103	- mv ../gnat-gpl-${PV}-src/src/ada gcc/ \|\| die
104	+ mv ../${P}-src/src/ada gcc/ \|\| die
105	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface \|\| die
106
107	sed -i \
108	@@ -152,7 +167,7 @@ src_compile() {
109	toolchain_src_compile
110	gcc_do_make "-C gcc gnatlib-shared"
111	ln -s gcc ../build/prev-gcc \|\| die
112	- ln -s x86_64-pc-linux-gnu ../build/prev-x86_64-pc-linux-gnu \|\| die
113	+ ln -s ${CHOST} ../build/prev-${CHOST} \|\| die
114	gcc_do_make "-C gcc gnattools"
115	}
116
117	@@ -190,7 +205,7 @@ src_install() {
118	pkg_postinst () {
119	toolchain_pkg_postinst
120	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
121	- einfo "Set the ADA variables to gcc-${TOOLCHAIN_GCC_PV} in your make.conf"
122	+ einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
123	einfo "Even if the c/c++ compilers are using almost the same patched"
124	einfo "source as the sys-devel/gcc package its use is not extensively"
125	einfo "tested, and not supported for updating your system, except for ada"

Gentoo Archives: gentoo-commits