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

Collapse All | Expand All

(-)bin/ebuild.sh (-2 / +23 lines)
Lines 516-523 Link Here
516
			--datadir=/usr/share \
516
			--datadir=/usr/share \
517
			--sysconfdir=/etc \
517
			--sysconfdir=/etc \
518
			--localstatedir=/var/lib \
518
			--localstatedir=/var/lib \
519
			"${DEFAULT_SRC_CONFIGURE_PARAMS[@]}" \
520
			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_ENABLES[@]}" ; do \
521
				use_enable ${s} ; \
522
			done )
523
			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_WITHS[@]}" ; do \
524
				use_with ${s} ; \
525
			done )
519
			"$@" \
526
			"$@" \
520
			${LOCAL_EXTRA_ECONF}
527
			${LOCAL_EXTRA_ECONF} \
521
528
522
		if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
529
		if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
523
			--prefix=/usr \
530
			--prefix=/usr \
Lines 527-532 Link Here
527
			--datadir=/usr/share \
534
			--datadir=/usr/share \
528
			--sysconfdir=/etc \
535
			--sysconfdir=/etc \
529
			--localstatedir=/var/lib \
536
			--localstatedir=/var/lib \
537
			"${DEFAULT_SRC_CONFIGURE_PARAMS[@]}" \
538
			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_ENABLES[@]}" ; do \
539
				use_enable ${s} ; \
540
			done )
541
			$(for s in "${DEFAULT_SRC_CONFIGURE_USE_WITHS[@]}" ; do \
542
				use_with ${s} ; \
543
			done )
530
			"$@"  \
544
			"$@"  \
531
			${LOCAL_EXTRA_ECONF}; then
545
			${LOCAL_EXTRA_ECONF}; then
532
546
Lines 629-641 Link Here
629
643
630
_eapi2_src_configure() {
644
_eapi2_src_configure() {
631
	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
645
	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
646
		if [ ${EAPI} != 2 ]; then
647
			unset $DEFAULT_SRC_CONFIGURE_USE_ENABLES
648
			unset $DEFAULT_SRC_CONFIGURE_USE_WITHS
649
		fi
632
		econf
650
		econf
633
	fi
651
	fi
634
}
652
}
635
653
636
_eapi2_src_compile() {
654
_eapi2_src_compile() {
637
	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
655
	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
638
		emake || die "emake failed"
656
		if [ ${EAPI} != 2 ]; then
657
			unset ${DEFAULT_SRC_COMPILE_EMAKE_PARAMS}
658
		fi
659
		emake "${DEFAULT_SRC_COMPILE_EMAKE_PARAMS[@]}"|| die "emake failed"
639
	fi
660
	fi
640
}
661
}
641
662

Return to bug 230725