Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/tcc/, dev-lang/tcc/files/
Date: Fri, 14 Feb 2020 22:40:28
Message-Id: 1581718755.6ae15f9c5720e894da56df3b04e28ac010832893.dlan@gentoo
1 commit: 6ae15f9c5720e894da56df3b04e28ac010832893
2 Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 14 22:13:37 2020 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 14 22:19:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae15f9c
7
8 dev-lang/tcc: drop old
9
10 Package-Manager: Portage-2.3.87, Repoman-2.3.20
11 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
12
13 dev-lang/tcc/Manifest | 1 -
14 dev-lang/tcc/files/clang.patch | 18 ----------
15 dev-lang/tcc/files/linker.patch | 18 ----------
16 dev-lang/tcc/tcc-0.9.26-r3.ebuild | 71 ---------------------------------------
17 4 files changed, 108 deletions(-)
18
19 diff --git a/dev-lang/tcc/Manifest b/dev-lang/tcc/Manifest
20 index eaccaa273ef..170ccf6bd97 100644
21 --- a/dev-lang/tcc/Manifest
22 +++ b/dev-lang/tcc/Manifest
23 @@ -1,2 +1 @@
24 -DIST tcc-0.9.26.tar.bz2 525906 BLAKE2B 588e387d563ddede9842ac9012df36520fb1596bd3047fda2684ab44e49f8c1a35c1560c2fee724933cfcad5d618d84df853b72e1fee144b551cb67f7af1558a SHA512 abdbe208498cf4865a2036b5426616f5888b9b0e8d5d2fda6d1dd4afab3386167f12eca87d8a5c4c9b7dc88620d983ddce3e874b7dfa9c21eceea29ffa635d53
25 DIST tcc-0.9.27.tar.bz2 634999 BLAKE2B 9a76dac9f54fa0b64a72e874cfec9a4bd9b938d244d064b2e76bd31acfb9e48fdbdb8895132634be1dee4302293405bf75606a6804c8178afa8fd30daa53b73a SHA512 835184292d97c07f0ff7b36ec550e855e649b04e23c7e2a1c706d223409eb60708dc1ae969f28eba45e56c8b96ae56936b93caf9d8a13ac5adf119014d5367a7
26
27 diff --git a/dev-lang/tcc/files/clang.patch b/dev-lang/tcc/files/clang.patch
28 deleted file mode 100644
29 index 01cc72335fd..00000000000
30 --- a/dev-lang/tcc/files/clang.patch
31 +++ /dev/null
32 @@ -1,18 +0,0 @@
33 -# Fix compiling tcc with clang. Upstream commit 73ac39c317a20accaf3b25ba833deee0c2e2849f
34 -# Gentoo bug #502452
35 -diff --git a/lib/libtcc1.c b/lib/libtcc1.c
36 -index cf9babf..b46fb5d 100644
37 ---- a/lib/libtcc1.c
38 -+++ b/lib/libtcc1.c
39 -@@ -647,6 +647,11 @@ struct __va_list_struct {
40 - char *reg_save_area;
41 - };
42 -
43 -+#undef __va_start
44 -+#undef __va_arg
45 -+#undef __va_copy
46 -+#undef __va_end
47 -+
48 - void *__va_start(void *fp)
49 - {
50 - struct __va_list_struct *ap =
51
52 diff --git a/dev-lang/tcc/files/linker.patch b/dev-lang/tcc/files/linker.patch
53 deleted file mode 100644
54 index 8304470e368..00000000000
55 --- a/dev-lang/tcc/files/linker.patch
56 +++ /dev/null
57 @@ -1,18 +0,0 @@
58 -# Fixes the default linker options for portage
59 -# Upstream commit ba286136bf8e48c71ffd6c2fd9ce97e64a6eeeb1
60 -
61 -diff --git a/libtcc.c b/libtcc.c
62 -index 127806f..dc78643 100644
63 ---- a/libtcc.c
64 -+++ b/libtcc.c
65 -@@ -1560,6 +1560,10 @@ static int tcc_set_linker(TCCState *s, const char *option)
66 - } else
67 - goto err;
68 -
69 -+ } else if (link_option(option, "as-needed", &p)) {
70 -+ ignoring = 1;
71 -+ } else if (link_option(option, "O", &p)) {
72 -+ ignoring = 1;
73 - } else if (link_option(option, "rpath=", &p)) {
74 - s->rpath = copy_linker_arg(p);
75 - } else if (link_option(option, "section-alignment=", &p)) {
76
77 diff --git a/dev-lang/tcc/tcc-0.9.26-r3.ebuild b/dev-lang/tcc/tcc-0.9.26-r3.ebuild
78 deleted file mode 100644
79 index 67fb6add1c2..00000000000
80 --- a/dev-lang/tcc/tcc-0.9.26-r3.ebuild
81 +++ /dev/null
82 @@ -1,71 +0,0 @@
83 -# Copyright 1999-2020 Gentoo Authors
84 -# Distributed under the terms of the GNU General Public License v2
85 -
86 -EAPI="6"
87 -
88 -inherit toolchain-funcs
89 -
90 -DESCRIPTION="A very small C compiler for ix86/amd64"
91 -HOMEPAGE="https://bellard.org/tcc/"
92 -SRC_URI="https://download.savannah.gnu.org/releases/tinycc/${P}.tar.bz2"
93 -
94 -LICENSE="LGPL-2.1"
95 -SLOT="0"
96 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
97 -
98 -DEPEND="dev-lang/perl" # doc generation
99 -RDEPEND=""
100 -IUSE="test"
101 -RESTRICT="!test? ( test )"
102 -
103 -src_prepare() {
104 - # Don't strip
105 - sed -i -e 's|$(INSTALL) -s|$(INSTALL)|' Makefile || die
106 -
107 - # Fix examples
108 - sed -i -e '1{
109 - i#! /usr/bin/tcc -run
110 - /^#!/d
111 - }' examples/ex*.c || die
112 - sed -i -e '1s/$/ -lX11/' examples/ex4.c || die
113 -
114 - # Fix texi2html invocation
115 - sed -i -e 's/-number//' Makefile || die
116 - sed -i -e 's/--sections//' Makefile || die
117 -
118 - # Fix compiling tcc with clang
119 - eapply "${FILESDIR}"/clang.patch
120 -
121 - # Allows using tcc as the system compiler for Gentoo
122 - eapply "${FILESDIR}"/linker.patch
123 -
124 - eapply_user
125 -}
126 -
127 -src_configure() {
128 - use test && unset CFLAGS LDFLAGS # Tests run with CC=tcc etc, they will fail hard otherwise
129 - # better fixes welcome, it feels wrong to hack the env like this
130 - # not autotools, so call configure directly
131 - ./configure --cc="$(tc-getCC)" \
132 - --prefix="${EPREFIX}/usr" \
133 - --libdir="${EPREFIX}/usr/$(get_libdir)" \
134 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
135 -}
136 -
137 -src_compile() {
138 - emake AR="$(tc-getAR)"
139 -}
140 -
141 -src_install() {
142 - emake DESTDIR="${D}" install
143 -
144 - dodoc Changelog README TODO VERSION
145 - #dohtml tcc-doc.html
146 - exeinto /usr/share/doc/${PF}/examples
147 - doexe examples/ex*.c
148 -}
149 -
150 -src_test() {
151 - # this is using tcc bits that don't know as-needed etc.
152 - TCCFLAGS="" emake test
153 -}