/[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.15 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.15 2008/12/10 01:15:47 robbat2 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
398# rebuilds the configure scripts. 398# rebuilds the configure scripts.
399apache-2_src_unpack() { 399apache-2_src_unpack() {
400 unpack ${A} 400 unpack ${A}
401 cd "${S}" 401 cd "${S}"
402 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
403 # Use correct multilib libdir in gentoo patches 421 # Use correct multilib libdir in gentoo patches
404 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ 422 sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \
405 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ 423 "${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \
406 || die "libdir sed failed" 424 || die "libdir sed failed"
407 425
426# 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
427# MY_CONF 445# MY_CONF
428apache-2_src_compile() { 446apache-2_src_compile() {
429 # Instead of filtering --as-needed (bug #128505), append --no-as-needed 447 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
430 # 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)
431 append-ldflags -Wl,--no-as-needed 452 append-ldflags -Wl,--no-as-needed
453 ;;
454 esac
432 455
433 # peruser MPM debugging with -X is nearly impossible 456 # peruser MPM debugging with -X is nearly impossible
434 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then 457 if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then
435 use debug && append-flags -DMPM_PERUSER_DEBUG 458 use debug && append-flags -DMPM_PERUSER_DEBUG
436 fi 459 fi
522 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot" 545 mv -f "${D}/var/www/localhost" "${D}/usr/share/${PF}/webroot"
523 eend $? 546 eend $?
524 547
525 # set some sane permissions for suexec 548 # set some sane permissions for suexec
526 if use suexec ; then 549 if use suexec ; then
527 fowners 0:apache /usr/sbin/suexec 550 fowners 0:${SUEXEC_CALLER:-apache} /usr/sbin/suexec
528 fperms 4710 /usr/sbin/suexec 551 fperms 4710 /usr/sbin/suexec
529 # provide legacy symlink for suexec, bug 177697 552 # provide legacy symlink for suexec, bug 177697
530 dosym /usr/sbin/suexec /usr/sbin/suexec2 553 dosym /usr/sbin/suexec /usr/sbin/suexec2
531 fi 554 fi
532 555

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.17

  ViewVC Help
Powered by ViewVC 1.1.20