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

(-)apache-2.eclass (-10 / +46 lines)
Lines 233-245 Link Here
233
		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
233
		MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
234
	fi
234
	fi
235
235
236
	if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
236
	MY_CONF="${MY_CONF} --enable-cgid=${mod_type} --enable-cgi=${mod_type}"
237
		MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
237
	MY_MODS="${MY_MODS} cgid cgi"
238
		MY_MODS="${MY_MODS} cgid"
239
	else
240
		MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
241
		MY_MODS="${MY_MODS} cgi"
242
	fi
243
238
244
	if use suexec ; then
239
	if use suexec ; then
245
		elog "You can manipulate several configure options of suexec"
240
		elog "You can manipulate several configure options of suexec"
Lines 417-423 Link Here
417
	if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
412
	if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
418
		use debug && append-flags -DMPM_PERUSER_DEBUG
413
		use debug && append-flags -DMPM_PERUSER_DEBUG
419
	fi
414
	fi
420
415
	
416
	MY_CONF_NOMOD="--enable-so=static --disable-suexec --without-ssl --disable-ssl --disable-cgid --disable-cgi"
417
	
418
	for x in ${IUSE_MODULES} ; do
419
		MY_CONF_NOMOD="${MY_CONF_NOMOD} --disable-${x}"
420
	done
421
	
422
	for mpm in ${IUSE_MPMS} ; do
423
		[ "${mpm}" == "${MY_MPM}" ] && continue
424
		
425
		econf \
426
			--includedir=/usr/include/apache2 \
427
			--libexecdir=/usr/$(get_libdir)/apache2/modules \
428
			--datadir=/var/www/localhost \
429
			--sysconfdir=/etc/apache2 \
430
			--localstatedir=/var \
431
			--with-mpm=${mpm} \
432
			--with-perl=/usr/bin/perl \
433
			--with-apr=/usr \
434
			--with-apr-util=/usr \
435
			--with-pcre=/usr \
436
			--with-z=/usr \
437
			--with-port=80 \
438
			--with-program-name=apache2-${mpm} \
439
			--enable-layout=Gentoo \
440
			${MY_CONF_NOMOD} || die "econf failed!"
441
		
442
		sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
443
		
444
		emake || die "emake failed"
445
		cp apache2-${mpm} apache2-${mpm}.preserve
446
		emake clean || die "failed to cleanup"
447
	done
448
	
421
	# econf overwrites the stuff from config.layout, so we have to put them into
449
	# econf overwrites the stuff from config.layout, so we have to put them into
422
	# our myconf line too
450
	# our myconf line too
423
	econf \
451
	econf \
Lines 433-439 Link Here
433
		--with-pcre=/usr \
461
		--with-pcre=/usr \
434
		--with-z=/usr \
462
		--with-z=/usr \
435
		--with-port=80 \
463
		--with-port=80 \
436
		--with-program-name=apache2 \
464
		--with-program-name=apache2-${MY_MPM} \
437
		--enable-layout=Gentoo \
465
		--enable-layout=Gentoo \
438
		${MY_CONF} || die "econf failed!"
466
		${MY_CONF} || die "econf failed!"
439
467
Lines 448-454 Link Here
448
# specific configuration files found in the tarball
476
# specific configuration files found in the tarball
449
apache-2_src_install() {
477
apache-2_src_install() {
450
	make DESTDIR="${D}" install || die "make install failed"
478
	make DESTDIR="${D}" install || die "make install failed"
451
479
	
480
	for mpm in ${IUSE_MPMS} ; do
481
		[ "${mpm}" == "${MY_MPM}" ] && continue
482
		mv apache2-${mpm}.preserve apache2-${mpm}
483
		dosbin apache2-${mpm}
484
	done
485
	
486
	dosym /usr/sbin/apache2-${MY_MPM} /usr/sbin/apache2
487
	
452
	# install our configuration files
488
	# install our configuration files
453
	keepdir /etc/apache2/vhosts.d
489
	keepdir /etc/apache2/vhosts.d
454
	keepdir /etc/apache2/modules.d
490
	keepdir /etc/apache2/modules.d

Return to bug 230315