/[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.11 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.11 2008/03/23 13:03:53 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
… …
371 fi 382 fi
372 383
373 elog "Please note that you need SysV IPC support in your kernel." 384 elog "Please note that you need SysV IPC support in your kernel."
374 elog "Make sure CONFIG_SYSVIPC=y is set." 385 elog "Make sure CONFIG_SYSVIPC=y is set."
375 elog 386 elog
387
388 if use userland_BSD; then
389 elog "On BSD systems you need to add the following line to /boot/loader.conf:"
390 elog " accf_http_load=\"YES\""
391 elog
392 fi
376} 393}
377 394
378# @FUNCTION: apache-2_src_unpack 395# @FUNCTION: apache-2_src_unpack
379# @DESCRIPTION: 396# @DESCRIPTION:
380# This function applies patches, configures a custom file-system layout and 397# This function applies patches, configures a custom file-system layout and
381# rebuilds the configure scripts. 398# rebuilds the configure scripts.
382apache-2_src_unpack() { 399apache-2_src_unpack() {
383 unpack ${A} 400 unpack ${A}
384 cd "${S}" 401 cd "${S}"
385 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
386 # Use correct multilib libdir in gentoo patches 421 # Use correct multilib libdir in gentoo patches
387 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 422 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
388 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 423 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
389 || die "libdir sed failed" 424 || die "libdir sed failed"
390 425
… …
409# 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
410# MY_CONF 445# MY_CONF
411apache-2_src_compile() { 446apache-2_src_compile() {
412 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 447 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
413 # 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)
414 append-ldflags -Wl,--no-as-needed 452 append-ldflags -Wl,--no-as-needed
453 ;;
454 esac
415 455
416 # peruser MPM debugging with -X is nearly impossible 456 # peruser MPM debugging with -X is nearly impossible
417 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 457 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
418 use debug && append-flags -DMPM_PERUSER_DEBUG 458 use debug && append-flags -DMPM_PERUSER_DEBUG
419 fi 459 fi
… …
425 --libexecdir=/usr/$(get_libdir)/apache2/modules \ 465 --libexecdir=/usr/$(get_libdir)/apache2/modules \
426 --datadir=/var/www/localhost \ 466 --datadir=/var/www/localhost \
427 --sysconfdir=/etc/apache2 \ 467 --sysconfdir=/etc/apache2 \
428 --localstatedir=/var \ 468 --localstatedir=/var \
429 --with-mpm=${MY_MPM} \ 469 --with-mpm=${MY_MPM} \
430 --with-perl=/usr/bin/perl \
431 --with-apr=/usr \ 470 --with-apr=/usr \
432 --with-apr-util=/usr \ 471 --with-apr-util=/usr \
433 --with-pcre=/usr \ 472 --with-pcre=/usr \
434 --with-z=/usr \ 473 --with-z=/usr \
435 --with-port=80 \ 474 --with-port=80 \
… …
471 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 510 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
472 511
473 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 512 newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2
474 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 513 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2
475 514
476 # link apache2ctl to the init script 515 # install apache2ctl wrapper for our init script if available
516 if test -e "${GENTOO_PATCHDIR}"/scripts/apache2ctl; then
517 exeinto /usr/sbin
518 doexe "${GENTOO_PATCHDIR}"/scripts/apache2ctl
519 else
477 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl 520 dosym /etc/init.d/apache2 /usr/sbin/apache2ctl
521 fi
478 522
479 # provide legacy symlink for apxs, bug 177697 523 # provide legacy symlink for apxs, bug 177697
480 dosym /usr/sbin/apxs /usr/sbin/apxs2 524 dosym /usr/sbin/apxs /usr/sbin/apxs2
481 525
482 # install some thirdparty scripts 526 # install some thirdparty scripts
… …
501 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot" 545 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot"
502 eend $? 546 eend $?
503 547
504 # set some sane permissions for suexec 548 # set some sane permissions for suexec
505 if use suexec ; then 549 if use suexec ; then
506 fowners 0:apache /usr/sbin/suexec 550 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
507 fperms 4710 /usr/sbin/suexec 551 fperms 4710 /usr/sbin/suexec
508 # provide legacy symlink for suexec, bug 177697 552 # provide legacy symlink for suexec, bug 177697
509 dosym /usr/sbin/suexec /usr/sbin/suexec2 553 dosym /usr/sbin/suexec /usr/sbin/suexec2
510 fi 554 fi
511 555
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.17
  ViewVC Help
Powered by ViewVC 1.1.13