Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 513578
Collapse All | Expand All

(-)file_not_specified_in_diff (-22 / +161 lines)
Line  Link Here
0
-- toolchain.eclass
0
++ toolchain.eclass
Lines 128-134 Link Here
128
	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
128
	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
129
	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
129
	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
130
	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
130
	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
131
	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
131
	tc_version_is_at_least 4.1 && IUSE+=" gcj-alsa gcj-dssi libssp objc++"
132
	tc_version_is_at_least 4.2 && IUSE_DEF+=" openmp"
132
	tc_version_is_at_least 4.2 && IUSE_DEF+=" openmp"
133
	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
133
	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
134
	tc_version_is_at_least 4.6 && IUSE+=" graphite"
134
	tc_version_is_at_least 4.6 && IUSE+=" graphite"
Lines 145-150 Link Here
145
	SLOT="${GCC_BRANCH_VER}"
145
	SLOT="${GCC_BRANCH_VER}"
146
fi
146
fi
147
147
148
#---->> REQUIRED_USE <<----
149
150
if ! has "${EAPI:-0}" 0 1 2 3 ; then
151
	REQUIRED_USE=""
152
	in_iuse gcj-alsa && REQUIRED_USE+=" gcj-alsa? ( gcj )"
153
	in_iuse gcj-dssi && REQUIRED_USE+=" gcj-dssi? ( gcj )"
154
fi
155
148
#---->> DEPEND <<----
156
#---->> DEPEND <<----
149
157
150
RDEPEND="sys-libs/zlib
158
RDEPEND="sys-libs/zlib
Lines 189-211 Link Here
189
	)"
197
	)"
190
198
191
if in_iuse gcj ; then
199
if in_iuse gcj ; then
192
	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
200
	DEPEND+=" gcj? ("
193
	GCJ_GTK_DEPS="
201
	RDEPEND+=" gcj? ("
194
		x11-libs/libXt
202
	GCC_GCJ_ZLIB_DEPS="
195
		x11-libs/libX11
203
		amd64? ( multilib? ( || (
196
		x11-libs/libXtst
204
			sys-libs/zlib[abi_x86_32]
197
		x11-proto/xproto
205
			app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
198
		x11-proto/xextproto
206
		) ) )"
199
		=x11-libs/gtk+-2*
207
	DEPEND+=" ${GCC_GCJ_ZLIB_DEPS}"
200
		virtual/pkgconfig
208
	RDEPEND+=" ${GCC_GCJ_ZLIB_DEPS}"
201
		amd64? ( multilib? (
209
202
			app-emulation/emul-linux-x86-gtklibs
210
	tc_version_is_at_least 4.2 && DEPEND+=" app-arch/zip app-arch/unzip"
203
			app-emulation/emul-linux-x86-xlibs
211
204
		) )
212
	if tc_version_is_at_least 4.4 ; then
205
	"
213
		GCC_GCJ_GMP_DEPS="
206
	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
214
			amd64? ( multilib? ( || (
207
	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
215
				dev-libs/gmp[abi_x86_32]
208
	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
216
				app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
217
			) ) )"
218
		DEPEND+=" ${GCC_GCJ_GMP_DEPS}"
219
		RDEPEND+=" ${GCC_GCJ_GMP_DEPS}"
220
	fi
221
222
	if in_iuse awt ; then
223
		DEPEND+=" awt? ("
224
		RDEPEND+=" awt? ("
225
		GCC_GCJ_GTK_DEPS="x11-libs/gtk+:2
226
			amd64? ( multilib? ( || (
227
				x11-libs/gtk+:2[abi_x86_32]
228
				app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
229
		) ) )"
230
		DEPEND+=" ${GCC_GCJ_GTK_DEPS}
231
			virtual/pkgconfig
232
			x11-libs/libX11
233
			x11-proto/xproto
234
			amd64? ( multilib? ( || (
235
				(
236
					x11-libs/libX11[abi_x86_32]
237
					x11-proto/xproto[abi_x86_32]
238
				)
239
				app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
240
			) ) )"
241
		RDEPEND+=" ${GCC_GCJ_GTK_DEPS}"
242
243
		if tc_version_is_between 3.4 4.1; then
244
			GCC_GCJ_LIBART_DEPS=">=media-libs/libart_lgpl-2.1
245
				amd64? ( multilib? ( || (
246
					>=media-libs/libart_lgpl-2.1[abi_x86_32]
247
					app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
248
				) ) )"
249
			DEPEND+=" ${GCC_GCJ_LIBART_DEPS}"
250
			RDEPEND+=" ${GCC_GCJ_LIBART_DEPS}"
251
		fi
252
253
		if tc_version_is_at_least 3.4 ; then
254
			GCC_GCJ_CAIRO_PANGO_DEPS="x11-libs/cairo
255
				x11-libs/pango
256
				amd64? ( multilib? ( || (
257
					(
258
						x11-libs/cairo[abi_x86_32]
259
						x11-libs/pango[abi_x86_32]
260
					)
261
					app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
262
				) ) )"
263
			DEPEND+=" ${GCC_GCJ_CAIRO_PANGO_DEPS}"
264
			RDEPEND+=" ${GCC_GCJ_CAIRO_PANGO_DEPS}"
265
		fi
266
267
		if tc_version_is_at_least 4.0 ; then
268
			GCC_GCJ_XTST_DEPS="x11-libs/libXtst
269
				amd64? ( multilib? ( || (
270
					x11-libs/libXtst[abi_x86_32]
271
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
272
				) ) )"
273
			DEPEND+=" ${GCC_GCJ_XTST_DEPS}"
274
			RDEPEND+=" ${GCC_GCJ_XTST_DEPS}"
275
		fi
276
277
		if tc_version_is_at_least 4.1 ; then
278
			GCC_GCJ_FREETYPE_DEPS="media-libs/freetype
279
				amd64? ( multilib? ( || (
280
					media-libs/freetype[abi_x86_32]
281
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
282
				) ) )"
283
			DEPEND+=" ${GCC_GCJ_FREETYPE_DEPS}"
284
			RDEPEND+=" ${GCC_GCJ_FREETYPE_DEPS}"
285
		fi
286
287
		if tc_version_is_at_least 4.2 ; then
288
			GCC_GCJ_XRANDR_XRENDER_DEPS="x11-libs/libXrandr
289
				x11-libs/libXrender
290
				amd64? ( multilib? ( || (
291
					(
292
						x11-libs/libXrandr[abi_x86_32]
293
						x11-libs/libXrender[abi_x86_32]
294
					)
295
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
296
				) ) )"
297
			DEPEND+=" ${GCC_GCJ_XRANDR_XRENDER_DEPS}"
298
			RDEPEND+=" ${GCC_GCJ_XRANDR_XRENDER_DEPS}"
299
		fi
300
		DEPEND+=" )"
301
		RDEPEND+=" )"
302
	fi
303
304
	if in_iuse gcj-alsa ; then
305
		GCC_GCJ_ALSA_LIBS="media-libs/alsa-lib
306
			amd64? ( multilib? ( || (
307
				media-libs/alsa-lib[abi_x86_32]
308
				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
309
			) ) )"
310
		DEPEND+=" gcj-alsa? ( ${GCC_GCJ_ALSA_LIBS} virtual/pkgconfig )"
311
		RDEPEND+=" gcj-alsa? ( ${GCC_GCJ_ALSA_LIBS} )"
312
	fi
313
314
	if in_iuse gcj-dssi ; then
315
		GCC_GCJ_DSSI_LIBS="media-sound/jack-audio-connection-kit
316
			amd64? ( multilib? ( || (
317
				media-sound/jack-audio-connection-kit[abi_x86_32]
318
				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
319
			) ) )"
320
		DEPEND+=" gcj-dssi? ( ${GCC_GCJ_DSSI_LIBS} media-libs/dssi )"
321
		RDEPEND+=" gcj-dssi? ( ${GCC_GCJ_DSSI_LIBS} )"
322
	fi
323
324
	DEPEND+=" )"
325
	RDEPEND+=" )"
209
fi
326
fi
210
327
211
PDEPEND=">=sys-devel/gcc-config-1.7"
328
PDEPEND=">=sys-devel/gcc-config-1.7"
Lines 576-581 Link Here
576
				einfo "  ${f%%...}"
693
				einfo "  ${f%%...}"
577
			done
694
			done
578
	fi
695
	fi
696
697
	mkdir -p "${T}"/pkgconfig
698
699
	# Disable check for libart.
700
	# https://gcc.gnu.org/PR61552
701
	if tc_version_is_at_least 4.1 ; then
702
		cat <<- EOF > "${T}"/pkgconfig/libart-2.0.pc
703
		Name: libart
704
		Description: libart
705
		Version: 2.1
706
		Cflags:
707
		Libs:
708
		EOF
709
	fi
579
}
710
}
580
711
581
guess_patch_type_in_dir() {
712
guess_patch_type_in_dir() {
Lines 1097-1106 Link Here
1097
1228
1098
	### library options
1229
	### library options
1099
1230
1100
	if ! is_gcj ; then
1231
	if is_gcj ; then
1232
		if use awt ; then
1233
			confgcc+=( --enable-java-awt=gtk )
1234
		fi
1235
		confgcc+=( $(use_enable gcj-alsa alsa) )
1236
		confgcc+=( $(use_enable gcj-dssi dssi) )
1237
	else
1101
		confgcc+=( --disable-libgcj )
1238
		confgcc+=( --disable-libgcj )
1102
	elif use awt ; then
1103
		confgcc+=( --enable-java-awt=gtk )
1104
	fi
1239
	fi
1105
1240
1106
	if tc_version_is_at_least 4.2 ; then
1241
	if tc_version_is_at_least 4.2 ; then
Lines 1180-1185 Link Here
1180
1315
1181
	confgcc+=( "$@" ${EXTRA_ECONF} )
1316
	confgcc+=( "$@" ${EXTRA_ECONF} )
1182
1317
1318
	local -x PKG_CONFIG_PATH="${T}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}"
1319
1183
	# Nothing wrong with a good dose of verbosity
1320
	# Nothing wrong with a good dose of verbosity
1184
	echo
1321
	echo
1185
	einfo "PREFIX:          ${PREFIX}"
1322
	einfo "PREFIX:          ${PREFIX}"
Lines 1473-1478 Link Here
1473
	[[ ! -x /usr/bin/perl ]] \
1610
	[[ ! -x /usr/bin/perl ]] \
1474
		&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
1611
		&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
1475
1612
1613
	local -x PKG_CONFIG_PATH="${T}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}"
1614
1476
	gcc_do_make ${GCC_MAKE_TARGET}
1615
	gcc_do_make ${GCC_MAKE_TARGET}
1477
}
1616
}
1478
1617

Return to bug 513578