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

(-)/usr/portage/eclass/apache-2.eclass (-5 / +16 lines)
Lines 390-395 Link Here
390
# This function applies patches, configures a custom file-system layout and
390
# This function applies patches, configures a custom file-system layout and
391
# rebuilds the configure scripts.
391
# rebuilds the configure scripts.
392
apache-2_src_prepare() {
392
apache-2_src_prepare() {
393
	tc-export CC
394
393
	# 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
395
	# 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
394
	# idea for everyone
396
	# idea for everyone
395
	case ${CHOST} in
397
	case ${CHOST} in
Lines 452-460 Link Here
452
		--sysconfdir=/etc/apache2 \
454
		--sysconfdir=/etc/apache2 \
453
		--localstatedir=/var \
455
		--localstatedir=/var \
454
		--with-mpm=${MY_MPM} \
456
		--with-mpm=${MY_MPM} \
455
		--with-apr=/usr \
457
		--with-apr=${ROOT}usr \
456
		--with-apr-util=/usr \
458
		--with-apr-util=${ROOT}usr \
457
		--with-pcre=/usr \
459
		--with-pcre=${ROOT}usr \
458
		--with-z=/usr \
460
		--with-z=/usr \
459
		--with-port=80 \
461
		--with-port=80 \
460
		--with-program-name=apache2 \
462
		--with-program-name=apache2 \
Lines 464-475 Link Here
464
	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
466
	sed -i -e 's:apache2\.conf:httpd.conf:' include/ap_config_auto.h
465
}
467
}
466
468
469
# @FUNCTION: apache-2_src_compile
470
apache-2_src_compile() {
471
	emake \
472
		LIBTOOL="${ROOT}usr/bin/libtool" \
473
		|| die "emake failed"
474
}
475
467
# @FUNCTION: apache-2_src_install
476
# @FUNCTION: apache-2_src_install
468
# @DESCRIPTION:
477
# @DESCRIPTION:
469
# This function runs `emake install' and generates, installs and adapts the gentoo
478
# This function runs `emake install' and generates, installs and adapts the gentoo
470
# specific configuration files found in the tarball
479
# specific configuration files found in the tarball
471
apache-2_src_install() {
480
apache-2_src_install() {
472
	make DESTDIR="${D}" install || die "make install failed"
481
	make DESTDIR="${D}" \
482
		LIBTOOL="${ROOT}usr/bin/libtool" \
483
		install || die "make install failed"
473
484
474
	# install our configuration files
485
	# install our configuration files
475
	keepdir /etc/apache2/vhosts.d
486
	keepdir /etc/apache2/vhosts.d
Lines 577-580 Link Here
577
588
578
}
589
}
579
590
580
EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst
591
EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_install pkg_postinst

Return to bug 385783