/[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.13 Revision 1.17
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2007 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.13 2008/10/25 14:46:00 hollow Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.17 2009/07/05 16:05:25 hollow 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
… …
16# INTERNAL VARIABLES 16# INTERNAL VARIABLES
17# ============================================================================== 17# ==============================================================================
18 18
19# @ECLASS-VARIABLE: GENTOO_PATCHNAME 19# @ECLASS-VARIABLE: GENTOO_PATCHNAME
20# @DESCRIPTION: 20# @DESCRIPTION:
21# This internal variable contains the prefix for the patch tarball 21# This internal variable contains the prefix for the patch tarball.
22GENTOO_PATCHNAME="gentoo-${PF}" 22# Defaults to the full name and version (including revision) of the package.
23# If you want to override this in an ebuild, use:
24# ORIG_PR="(revision of Gentoo stuff you want)"
25# GENTOO_PATCHNAME="gentoo-${PN}-${PV}${ORIG_PR:+-${ORIG_PR}}"
26[[ -n "$GENTOO_PATCHNAME" ]] || GENTOO_PATCHNAME="gentoo-${PF}"
23 27
24# @ECLASS-VARIABLE: GENTOO_PATCHDIR 28# @ECLASS-VARIABLE: GENTOO_PATCHDIR
25# @DESCRIPTION: 29# @DESCRIPTION:
26# This internal variable contains the working directory where patches and config 30# This internal variable contains the working directory where patches and config
27# files are located 31# files are located.
32# Defaults to the patchset name appended to the working directory.
28GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}" 33[[ -n "$GENTOO_PATCHDIR" ]] || GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
29 34
30# @VARIABLE: GENTOO_DEVELOPER 35# @VARIABLE: GENTOO_DEVELOPER
31# @DESCRIPTION: 36# @DESCRIPTION:
32# This variable needs to be set in the ebuild and contains the name of the 37# This variable needs to be set in the ebuild and contains the name of the
33# gentoo developer who created the patch tarball 38# gentoo developer who created the patch tarball
… …
35# @VARIABLE: GENTOO_PATCHSTAMP 40# @VARIABLE: GENTOO_PATCHSTAMP
36# @DESCRIPTION: 41# @DESCRIPTION:
37# This variable needs to be set in the ebuild and contains the date the patch 42# This variable needs to be set in the ebuild and contains the date the patch
38# tarball was created at in YYYYMMDD format 43# tarball was created at in YYYYMMDD format
39 44
45# @VARIABLE: GENTOO_PATCH_A
46# @DESCRIPTION:
47# This variable should contain the entire filename of patch tarball.
48# Defaults to the name of the patchset, with a datestamp.
49[[ -n "$GENTOO_PATCH_A" ]] || GENTOO_PATCH_A="${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
50
40SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2 51SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
41 http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2" 52 http://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCH_A}"
42 53
43# @VARIABLE: IUSE_MPMS_FORK 54# @VARIABLE: IUSE_MPMS_FORK
44# @DESCRIPTION: 55# @DESCRIPTION:
45# This variable needs to be set in the ebuild and contains a list of forking 56# This variable needs to be set in the ebuild and contains a list of forking
46# (i.e. non-threaded) MPMs 57# (i.e. non-threaded) MPMs
… …
387# rebuilds the configure scripts. 398# rebuilds the configure scripts.
388apache-2_src_unpack() { 399apache-2_src_unpack() {
389 unpack ${A} 400 unpack ${A}
390 cd "${S}" 401 cd "${S}"
391 402
403 # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good
404 # idea for everyone
405 case ${CHOST} in
406 *-linux-gnu|*-solaris*|*-freebsd*)
407 # do nothing, these use GNU binutils
408 :
409 ;;
410 *-darwin*)
411 sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \
412 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
413 ;;
414 *)
415 # patch it out to be like upstream
416 sed -i -e 's/-Wl,-z,now//g' \
417 "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch
418 ;;
419 esac
420
392 # Use correct multilib libdir in gentoo patches 421 # Use correct multilib libdir in gentoo patches
393 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 422 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
394 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 423 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
395 || die "libdir sed failed" 424 || die "libdir sed failed"
396 425
… …
415# This function adds compiler flags and runs econf and emake based on MY_MPM and 444# This function adds compiler flags and runs econf and emake based on MY_MPM and
416# MY_CONF 445# MY_CONF
417apache-2_src_compile() { 446apache-2_src_compile() {
418 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 447 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
419 # Thanks to Harald van Dijk 448 # Thanks to Harald van Dijk
449 # ... but only on platforms that use a GNU linker!
450 case ${CHOST} in
451 *-solaris* | *-*bsd* | *-linux-gnu)
420 append-ldflags -Wl,--no-as-needed 452 append-ldflags -Wl,--no-as-needed
453 ;;
454 esac
421 455
422 # peruser MPM debugging with -X is nearly impossible 456 # peruser MPM debugging with -X is nearly impossible
423 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 457 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
424 use debug && append-flags -DMPM_PERUSER_DEBUG 458 use debug && append-flags -DMPM_PERUSER_DEBUG
425 fi 459 fi
… …
511 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot" 545 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot"
512 eend $? 546 eend $?
513 547
514 # set some sane permissions for suexec 548 # set some sane permissions for suexec
515 if use suexec ; then 549 if use suexec ; then
516 fowners 0:apache /usr/sbin/suexec 550 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
517 fperms 4710 /usr/sbin/suexec 551 fperms 4710 /usr/sbin/suexec
518 # provide legacy symlink for suexec, bug 177697 552 # provide legacy symlink for suexec, bug 177697
519 dosym /usr/sbin/suexec /usr/sbin/suexec2 553 dosym /usr/sbin/suexec /usr/sbin/suexec2
520 fi 554 fi
521 555
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.17
  ViewVC Help
Powered by ViewVC 1.1.13