Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/
Date: Sun, 12 Jan 2020 16:43:43
Message-Id: 1578847414.bde530ac386dd4b1b8c6154d5fdd717da5ba4566.slyfox@gentoo
1 commit: bde530ac386dd4b1b8c6154d5fdd717da5ba4566
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 12 16:43:25 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 12 16:43:34 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde530ac
7
8 dev-util/mingw64-runtime: drop old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-util/mingw64-runtime/Manifest | 1 -
14 .../mingw64-runtime/mingw64-runtime-5.0.4.ebuild | 107 --------------------
15 .../mingw64-runtime-6.0.0-r1.ebuild | 112 ---------------------
16 3 files changed, 220 deletions(-)
17
18 diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
19 index 5a4b7418b8c..2769e87b5d4 100644
20 --- a/dev-util/mingw64-runtime/Manifest
21 +++ b/dev-util/mingw64-runtime/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
24 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
25 DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
26
27 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
28 deleted file mode 100644
29 index 93965bb06d7..00000000000
30 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
31 +++ /dev/null
32 @@ -1,107 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -export CBUILD=${CBUILD:-${CHOST}}
39 -export CTARGET=${CTARGET:-${CHOST}}
40 -if [[ ${CTARGET} == ${CHOST} ]] ; then
41 - if [[ ${CATEGORY} == cross-* ]] ; then
42 - export CTARGET=${CATEGORY#cross-}
43 - fi
44 -fi
45 -
46 -WANT_AUTOMAKE="1.15"
47 -
48 -inherit autotools flag-o-matic eutils
49 -
50 -DESCRIPTION="Free Win64 runtime and import library definitions"
51 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
52 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
53 -
54 -LICENSE="BSD"
55 -SLOT="0"
56 -KEYWORDS="~amd64 ~x86"
57 -IUSE="headers-only idl libraries tools"
58 -RESTRICT="strip"
59 -
60 -S="${WORKDIR}/mingw-w64-v${PV}"
61 -
62 -is_crosscompile() {
63 - [[ ${CHOST} != ${CTARGET} ]]
64 -}
65 -just_headers() {
66 - use headers-only
67 -}
68 -alt_prefix() {
69 - is_crosscompile && echo /usr/${CTARGET}
70 -}
71 -crt_with() {
72 - just_headers && echo --without-$1 || echo --with-$1
73 -}
74 -crt_use_enable() {
75 - just_headers && echo --without-$2 || use_enable "$@"
76 -}
77 -crt_use_with() {
78 - just_headers && echo --without-$2 || use_with "$@"
79 -}
80 -
81 -pkg_setup() {
82 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
83 - die "Invalid configuration"
84 - fi
85 -}
86 -
87 -src_configure() {
88 - CHOST=${CTARGET} strip-unsupported-flags
89 -
90 - if ! just_headers; then
91 - mkdir "${WORKDIR}/headers"
92 - pushd "${WORKDIR}/headers" > /dev/null
93 - CHOST=${CTARGET} "${S}/configure" \
94 - --prefix="${T}/tmproot" \
95 - --with-headers \
96 - --without-crt \
97 - || die
98 - popd > /dev/null
99 - append-cppflags "-I${T}/tmproot/include"
100 - fi
101 -
102 - # By default configure tries to set --sysroot=${prefix}. We disable
103 - # this behaviour with --with-sysroot=no to use gcc's sysroot default.
104 - # That way we can cross-build mingw64-runtime with cross-emerge.
105 - CHOST=${CTARGET} econf \
106 - --with-sysroot=no \
107 - --prefix="${EPREFIX}"$(alt_prefix)/usr \
108 - --with-headers \
109 - --enable-sdk \
110 - $(crt_with crt) \
111 - $(crt_use_enable idl idl) \
112 - $(crt_use_with libraries libraries) \
113 - $(crt_use_with tools tools) \
114 - $(
115 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
116 - && echo --disable-lib32 --enable-lib64 \
117 - || echo --enable-lib32 --disable-lib64
118 - )
119 -}
120 -
121 -src_compile() {
122 - if ! just_headers; then
123 - emake -C "${WORKDIR}/headers" install
124 - fi
125 - default
126 -}
127 -
128 -src_install() {
129 - default
130 -
131 - if is_crosscompile ; then
132 - # gcc is configured to look at specific hard-coded paths for mingw #419601
133 - dosym usr /usr/${CTARGET}/mingw
134 - dosym usr /usr/${CTARGET}/${CTARGET}
135 - dosym usr/include /usr/${CTARGET}/sys-include
136 - fi
137 -
138 - rm -rf "${ED}/usr/share"
139 -}
140
141 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
142 deleted file mode 100644
143 index dbf9db4e858..00000000000
144 --- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
145 +++ /dev/null
146 @@ -1,112 +0,0 @@
147 -# Copyright 1999-2018 Gentoo Authors
148 -# Distributed under the terms of the GNU General Public License v2
149 -
150 -EAPI=6
151 -
152 -export CBUILD=${CBUILD:-${CHOST}}
153 -export CTARGET=${CTARGET:-${CHOST}}
154 -if [[ ${CTARGET} == ${CHOST} ]] ; then
155 - if [[ ${CATEGORY} == cross-* ]] ; then
156 - export CTARGET=${CATEGORY#cross-}
157 - fi
158 -fi
159 -
160 -inherit autotools flag-o-matic eutils
161 -
162 -DESCRIPTION="Free Win64 runtime and import library definitions"
163 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
164 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
165 -
166 -LICENSE="BSD"
167 -SLOT="0"
168 -KEYWORDS="~amd64 ~x86"
169 -# USE=libraries needs working stage2 compiler: bug #665512
170 -IUSE="headers-only idl libraries tools"
171 -RESTRICT="strip"
172 -
173 -S="${WORKDIR}/mingw-w64-v${PV}"
174 -
175 -is_crosscompile() {
176 - [[ ${CHOST} != ${CTARGET} ]]
177 -}
178 -just_headers() {
179 - use headers-only
180 -}
181 -alt_prefix() {
182 - is_crosscompile && echo /usr/${CTARGET}
183 -}
184 -crt_with() {
185 - just_headers && echo --without-$1 || echo --with-$1
186 -}
187 -crt_use_enable() {
188 - just_headers && echo --without-$2 || use_enable "$@"
189 -}
190 -crt_use_with() {
191 - just_headers && echo --without-$2 || use_with "$@"
192 -}
193 -
194 -pkg_setup() {
195 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
196 - die "Invalid configuration"
197 - fi
198 -}
199 -
200 -src_configure() {
201 - CHOST=${CTARGET} strip-unsupported-flags
202 - # Normally mingw-64 does not use dynamic linker.
203 - # But at configure time it uses $LDFLAGS.
204 - # When default -Wl,--hash-style=gnu is passed
205 - # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
206 - # for target ld and binaries crash at shutdown.
207 - filter-ldflags '-Wl,--hash-style=*'
208 -
209 - if ! just_headers; then
210 - mkdir "${WORKDIR}/headers"
211 - pushd "${WORKDIR}/headers" > /dev/null
212 - CHOST=${CTARGET} "${S}/configure" \
213 - --prefix="${T}/tmproot" \
214 - --with-headers \
215 - --without-crt \
216 - || die
217 - popd > /dev/null
218 - append-cppflags "-I${T}/tmproot/include"
219 - fi
220 -
221 - # By default configure tries to set --sysroot=${prefix}. We disable
222 - # this behaviour with --with-sysroot=no to use gcc's sysroot default.
223 - # That way we can cross-build mingw64-runtime with cross-emerge.
224 - CHOST=${CTARGET} econf \
225 - --with-sysroot=no \
226 - --prefix="${EPREFIX}"$(alt_prefix)/usr \
227 - --with-headers \
228 - --enable-sdk \
229 - $(crt_with crt) \
230 - $(crt_use_enable idl idl) \
231 - $(crt_use_with libraries libraries) \
232 - $(crt_use_with tools tools) \
233 - $(
234 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
235 - && echo --disable-lib32 --enable-lib64 \
236 - || echo --enable-lib32 --disable-lib64
237 - )
238 -}
239 -
240 -src_compile() {
241 - if ! just_headers; then
242 - emake -C "${WORKDIR}/headers" install
243 - fi
244 - default
245 -}
246 -
247 -src_install() {
248 - default
249 -
250 - if is_crosscompile ; then
251 - # gcc is configured to look at specific hard-coded paths for mingw #419601
252 - dosym usr /usr/${CTARGET}/mingw
253 - dosym usr /usr/${CTARGET}/${CTARGET}
254 - dosym usr/include /usr/${CTARGET}/sys-include
255 - fi
256 -
257 - rm -rf "${ED}/usr/share"
258 -}