/[gentoo-x86]/eclass/apache-2.eclass
Gentoo

Diff of /eclass/apache-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.33 Revision 1.34
1# Copyright 1999-2014 Gentoo Foundation 1# Copyright 1999-2014 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.33 2014/01/08 08:38:10 patrick Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.34 2014/01/31 08:29:39 vapier Exp $
4 4
5# @ECLASS: apache-2.eclass 5# @ECLASS: apache-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# apache-devs@gentoo.org 7# apache-devs@gentoo.org
8# @BLURB: Provides a common set of functions for apache-2.x ebuilds 8# @BLURB: Provides a common set of functions for apache-2.x ebuilds
9# @DESCRIPTION: 9# @DESCRIPTION:
10# This eclass handles apache-2.x ebuild functions such as LoadModule generation 10# This eclass handles apache-2.x ebuild functions such as LoadModule generation
11# and inter-module dependency checking. 11# and inter-module dependency checking.
12 12
13inherit autotools eutils flag-o-matic multilib ssl-cert user 13inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs
14 14
15# ============================================================================== 15# ==============================================================================
16# INTERNAL VARIABLES 16# INTERNAL VARIABLES
17# ============================================================================== 17# ==============================================================================
18 18
422 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in 422 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
423 423
424 # patched-in MPMs need the build environment rebuilt 424 # patched-in MPMs need the build environment rebuilt
425 sed -i -e '/sinclude/d' configure.in 425 sed -i -e '/sinclude/d' configure.in
426 AT_M4DIR=build eautoreconf 426 AT_M4DIR=build eautoreconf
427
428 # This package really should upgrade to using pcre's .pc file.
429 cat <<-\EOF >"${T}"/pcre-config
430 #!/bin/sh
431 [ "${flag}" = "--version" ] && set -- --modversion
432 exec ${PKG_CONFIG} libpcre "$@"
433 EOF
434 chmod a+x "${T}"/pcre-config
427} 435}
428 436
429# @FUNCTION: apache-2_src_configure 437# @FUNCTION: apache-2_src_configure
430# @DESCRIPTION: 438# @DESCRIPTION:
431# This function adds compiler flags and runs econf and emake based on MY_MPM and 439# This function adds compiler flags and runs econf and emake based on MY_MPM and
432# MY_CONF 440# MY_CONF
433apache-2_src_configure() { 441apache-2_src_configure() {
442 tc-export PKG_CONFIG
443
434 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 444 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
435 # Thanks to Harald van Dijk 445 # Thanks to Harald van Dijk
436 append-ldflags $(no-as-needed) 446 append-ldflags $(no-as-needed)
437 447
438 # peruser MPM debugging with -X is nearly impossible 448 # peruser MPM debugging with -X is nearly impossible
440 use debug && append-flags -DMPM_PERUSER_DEBUG 450 use debug && append-flags -DMPM_PERUSER_DEBUG
441 fi 451 fi
442 452
443 # econf overwrites the stuff from config.layout, so we have to put them into 453 # econf overwrites the stuff from config.layout, so we have to put them into
444 # our myconf line too 454 # our myconf line too
455 ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
445 econf \ 456 econf \
446 --includedir=/usr/include/apache2 \ 457 --includedir=/usr/include/apache2 \
447 --libexecdir=/usr/$(get_libdir)/apache2/modules \ 458 --libexecdir=/usr/$(get_libdir)/apache2/modules \
448 --datadir=/var/www/localhost \ 459 --datadir=/var/www/localhost \
449 --sysconfdir=/etc/apache2 \ 460 --sysconfdir=/etc/apache2 \
450 --localstatedir=/var \ 461 --localstatedir=/var \
451 --with-mpm=${MY_MPM} \ 462 --with-mpm=${MY_MPM} \
452 --with-apr=/usr \ 463 --with-apr="${SYSROOT}"/usr \
453 --with-apr-util=/usr \ 464 --with-apr-util="${SYSROOT}"/usr \
454 --with-pcre=/usr \ 465 --with-pcre="${T}"/pcre-config \
455 --with-z=/usr \ 466 --with-z=/usr \
456 --with-port=80 \ 467 --with-port=80 \
457 --with-program-name=apache2 \ 468 --with-program-name=apache2 \
458 --enable-layout=Gentoo \ 469 --enable-layout=Gentoo \
459 ${MY_CONF} || die "econf failed!" 470 ${MY_CONF} || die "econf failed!"

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

  ViewVC Help
Powered by ViewVC 1.1.20