Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 511832 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-22 / +161 lines)
Line  Link Here
0
-- toolchain.eclass
0
++ toolchain.eclass
Lines 130-136 Link Here
130
	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
130
	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
131
	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
131
	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
132
	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
132
	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
133
	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
133
	tc_version_is_at_least 4.1 && IUSE+=" gcj-alsa gcj-dssi libssp objc++"
134
	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
134
	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
135
	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
135
	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
136
	tc_version_is_at_least 4.6 && IUSE+=" graphite"
136
	tc_version_is_at_least 4.6 && IUSE+=" graphite"
Lines 148-153 Link Here
148
	SLOT="${GCC_BRANCH_VER}"
148
	SLOT="${GCC_BRANCH_VER}"
149
fi
149
fi
150
150
151
#---->> REQUIRED_USE <<----
152
153
if ! has "${EAPI:-0}" 0 1 2 3 ; then
154
	REQUIRED_USE=""
155
	in_iuse gcj-alsa && REQUIRED_USE+=" gcj-alsa? ( gcj )"
156
	in_iuse gcj-dssi && REQUIRED_USE+=" gcj-dssi? ( gcj )"
157
fi
158
151
#---->> DEPEND <<----
159
#---->> DEPEND <<----
152
160
153
RDEPEND="sys-libs/zlib
161
RDEPEND="sys-libs/zlib
Lines 192-214 Link Here
192
	)"
200
	)"
193
201
194
if in_iuse gcj ; then
202
if in_iuse gcj ; then
195
	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
203
	DEPEND+=" gcj? ("
196
	GCJ_GTK_DEPS="
204
	RDEPEND+=" gcj? ("
197
		x11-libs/libXt
205
	GCC_GCJ_ZLIB_DEPS="
198
		x11-libs/libX11
206
		amd64? ( multilib? ( || (
199
		x11-libs/libXtst
207
			sys-libs/zlib[abi_x86_32]
200
		x11-proto/xproto
208
			app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
201
		x11-proto/xextproto
209
		) ) )"
202
		=x11-libs/gtk+-2*
210
	DEPEND+=" ${GCC_GCJ_ZLIB_DEPS}"
203
		virtual/pkgconfig
211
	RDEPEND+=" ${GCC_GCJ_ZLIB_DEPS}"
204
		amd64? ( multilib? (
212
205
			app-emulation/emul-linux-x86-gtklibs
213
	tc_version_is_at_least 4.2 && DEPEND+=" app-arch/zip app-arch/unzip"
206
			app-emulation/emul-linux-x86-xlibs
214
207
		) )
215
	if tc_version_is_at_least 4.4 ; then
208
	"
216
		GCC_GCJ_GMP_DEPS="
209
	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
217
			amd64? ( multilib? ( || (
210
	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
218
				dev-libs/gmp[abi_x86_32]
211
	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
219
				app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
220
			) ) )"
221
		DEPEND+=" ${GCC_GCJ_GMP_DEPS}"
222
		RDEPEND+=" ${GCC_GCJ_GMP_DEPS}"
223
	fi
224
225
	if in_iuse awt ; then
226
		DEPEND+=" awt? ("
227
		RDEPEND+=" awt? ("
228
		GCC_GCJ_GTK_DEPS="x11-libs/gtk+:2
229
			amd64? ( multilib? ( || (
230
				x11-libs/gtk+:2[abi_x86_32]
231
				app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
232
		) ) )"
233
		DEPEND+=" ${GCC_GCJ_GTK_DEPS}
234
			virtual/pkgconfig
235
			x11-libs/libX11
236
			x11-proto/xproto
237
			amd64? ( multilib? ( || (
238
				(
239
					x11-libs/libX11[abi_x86_32]
240
					x11-proto/xproto[abi_x86_32]
241
				)
242
				app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
243
			) ) )"
244
		RDEPEND+=" ${GCC_GCJ_GTK_DEPS}"
245
246
		if tc_version_is_between 3.4 4.1; then
247
			GCC_GCJ_LIBART_DEPS=">=media-libs/libart_lgpl-2.1
248
				amd64? ( multilib? ( || (
249
					>=media-libs/libart_lgpl-2.1[abi_x86_32]
250
					app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
251
				) ) )"
252
			DEPEND+=" ${GCC_GCJ_LIBART_DEPS}"
253
			RDEPEND+=" ${GCC_GCJ_LIBART_DEPS}"
254
		fi
255
256
		if tc_version_is_at_least 3.4 ; then
257
			GCC_GCJ_CAIRO_PANGO_DEPS="x11-libs/cairo
258
				x11-libs/pango
259
				amd64? ( multilib? ( || (
260
					(
261
						x11-libs/cairo[abi_x86_32]
262
						x11-libs/pango[abi_x86_32]
263
					)
264
					app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
265
				) ) )"
266
			DEPEND+=" ${GCC_GCJ_CAIRO_PANGO_DEPS}"
267
			RDEPEND+=" ${GCC_GCJ_CAIRO_PANGO_DEPS}"
268
		fi
269
270
		if tc_version_is_at_least 4.0 ; then
271
			GCC_GCJ_XTST_DEPS="x11-libs/libXtst
272
				amd64? ( multilib? ( || (
273
					x11-libs/libXtst[abi_x86_32]
274
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
275
				) ) )"
276
			DEPEND+=" ${GCC_GCJ_XTST_DEPS}"
277
			RDEPEND+=" ${GCC_GCJ_XTST_DEPS}"
278
		fi
279
280
		if tc_version_is_at_least 4.1 ; then
281
			GCC_GCJ_FREETYPE_DEPS="media-libs/freetype
282
				amd64? ( multilib? ( || (
283
					media-libs/freetype[abi_x86_32]
284
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
285
				) ) )"
286
			DEPEND+=" ${GCC_GCJ_FREETYPE_DEPS}"
287
			RDEPEND+=" ${GCC_GCJ_FREETYPE_DEPS}"
288
		fi
289
290
		if tc_version_is_at_least 4.2 ; then
291
			GCC_GCJ_XRANDR_XRENDER_DEPS="x11-libs/libXrandr
292
				x11-libs/libXrender
293
				amd64? ( multilib? ( || (
294
					(
295
						x11-libs/libXrandr[abi_x86_32]
296
						x11-libs/libXrender[abi_x86_32]
297
					)
298
					app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
299
				) ) )"
300
			DEPEND+=" ${GCC_GCJ_XRANDR_XRENDER_DEPS}"
301
			RDEPEND+=" ${GCC_GCJ_XRANDR_XRENDER_DEPS}"
302
		fi
303
		DEPEND+=" )"
304
		RDEPEND+=" )"
305
	fi
306
307
	if in_iuse gcj-alsa ; then
308
		GCC_GCJ_ALSA_LIBS="media-libs/alsa-lib
309
			amd64? ( multilib? ( || (
310
				media-libs/alsa-lib[abi_x86_32]
311
				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
312
			) ) )"
313
		DEPEND+=" gcj-alsa? ( ${GCC_GCJ_ALSA_LIBS} virtual/pkgconfig )"
314
		RDEPEND+=" gcj-alsa? ( ${GCC_GCJ_ALSA_LIBS} )"
315
	fi
316
317
	if in_iuse gcj-dssi ; then
318
		GCC_GCJ_DSSI_LIBS="media-sound/jack-audio-connection-kit
319
			amd64? ( multilib? ( || (
320
				media-sound/jack-audio-connection-kit[abi_x86_32]
321
				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
322
			) ) )"
323
		DEPEND+=" gcj-dssi? ( ${GCC_GCJ_DSSI_LIBS} media-libs/dssi )"
324
		RDEPEND+=" gcj-dssi? ( ${GCC_GCJ_DSSI_LIBS} )"
325
	fi
326
327
	DEPEND+=" )"
328
	RDEPEND+=" )"
212
fi
329
fi
213
330
214
PDEPEND=">=sys-devel/gcc-config-1.7"
331
PDEPEND=">=sys-devel/gcc-config-1.7"
Lines 579-584 Link Here
579
				einfo "  ${f%%...}"
696
				einfo "  ${f%%...}"
580
			done
697
			done
581
	fi
698
	fi
699
700
	mkdir -p "${T}"/pkgconfig
701
702
	# Disable check for libart.
703
	# https://gcc.gnu.org/PR61552
704
	if tc_version_is_at_least 4.1 ; then
705
		cat <<- EOF > "${T}"/pkgconfig/libart-2.0.pc
706
		Name: libart
707
		Description: libart
708
		Version: 2.1
709
		Cflags:
710
		Libs:
711
		EOF
712
	fi
582
}
713
}
583
714
584
guess_patch_type_in_dir() {
715
guess_patch_type_in_dir() {
Lines 1106-1115 Link Here
1106
1237
1107
	### library options
1238
	### library options
1108
1239
1109
	if ! is_gcj ; then
1240
	if is_gcj ; then
1241
		if use awt ; then
1242
			confgcc+=( --enable-java-awt=gtk )
1243
		fi
1244
		confgcc+=( $(use_enable gcj-alsa alsa) )
1245
		confgcc+=( $(use_enable gcj-dssi dssi) )
1246
	else
1110
		confgcc+=( --disable-libgcj )
1247
		confgcc+=( --disable-libgcj )
1111
	elif use awt ; then
1112
		confgcc+=( --enable-java-awt=gtk )
1113
	fi
1248
	fi
1114
1249
1115
	if tc_version_is_at_least 4.2 ; then
1250
	if tc_version_is_at_least 4.2 ; then
Lines 1195-1200 Link Here
1195
1330
1196
	confgcc+=( "$@" ${EXTRA_ECONF} )
1331
	confgcc+=( "$@" ${EXTRA_ECONF} )
1197
1332
1333
	local -x PKG_CONFIG_PATH="${T}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}"
1334
1198
	# Nothing wrong with a good dose of verbosity
1335
	# Nothing wrong with a good dose of verbosity
1199
	echo
1336
	echo
1200
	einfo "PREFIX:          ${PREFIX}"
1337
	einfo "PREFIX:          ${PREFIX}"
Lines 1488-1493 Link Here
1488
	[[ ! -x /usr/bin/perl ]] \
1625
	[[ ! -x /usr/bin/perl ]] \
1489
		&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
1626
		&& find "${WORKDIR}"/build -name '*.[17]' | xargs touch
1490
1627
1628
	local -x PKG_CONFIG_PATH="${T}/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH}"
1629
1491
	gcc_do_make ${GCC_MAKE_TARGET}
1630
	gcc_do_make ${GCC_MAKE_TARGET}
1492
}
1631
}
1493
1632

Return to bug 511832