| 1 |
grobian 09/04/04 17:50:51 |
| 2 |
|
| 3 |
Modified: apache-2.eclass |
| 4 |
Log: |
| 5 |
Backport non-GNU ld fixes for most notably Darwin from Prefix |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.16 eclass/apache-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-2.eclass?rev=1.16&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-2.eclass?rev=1.16&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-2.eclass?r1=1.15&r2=1.16 |
| 13 |
|
| 14 |
Index: apache-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v |
| 17 |
retrieving revision 1.15 |
| 18 |
retrieving revision 1.16 |
| 19 |
diff -u -r1.15 -r1.16 |
| 20 |
--- apache-2.eclass 10 Dec 2008 01:15:47 -0000 1.15 |
| 21 |
+++ apache-2.eclass 4 Apr 2009 17:50:51 -0000 1.16 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.15 2008/12/10 01:15:47 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.16 2009/04/04 17:50:51 grobian Exp $ |
| 27 |
|
| 28 |
# @ECLASS: apache-2.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -400,6 +400,24 @@ |
| 31 |
unpack ${A} |
| 32 |
cd "${S}" |
| 33 |
|
| 34 |
+ # 03_all_gentoo-apache-tools.patch injects -Wl,-z,now, which is not a good |
| 35 |
+ # idea for everyone |
| 36 |
+ case ${CHOST} in |
| 37 |
+ *-linux-gnu|*-solaris*|*-freebsd*) |
| 38 |
+ # do nothing, these use GNU binutils |
| 39 |
+ : |
| 40 |
+ ;; |
| 41 |
+ *-darwin*) |
| 42 |
+ sed -i -e 's/-Wl,-z,now/-Wl,-bind_at_load/g' \ |
| 43 |
+ "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch |
| 44 |
+ ;; |
| 45 |
+ *) |
| 46 |
+ # patch it out to be like upstream |
| 47 |
+ sed -i -e 's/-Wl,-z,now//g' \ |
| 48 |
+ "${GENTOO_PATCHDIR}"/patches/03_all_gentoo_apache-tools.patch |
| 49 |
+ ;; |
| 50 |
+ esac |
| 51 |
+ |
| 52 |
# Use correct multilib libdir in gentoo patches |
| 53 |
sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" \ |
| 54 |
"${GENTOO_PATCHDIR}"/{conf/httpd.conf,init/*,patches/config.layout} \ |
| 55 |
@@ -428,7 +446,12 @@ |
| 56 |
apache-2_src_compile() { |
| 57 |
# Instead of filtering --as-needed (bug #128505), append --no-as-needed |
| 58 |
# Thanks to Harald van Dijk |
| 59 |
- append-ldflags -Wl,--no-as-needed |
| 60 |
+ # ... but only on platforms that use a GNU linker! |
| 61 |
+ case ${CHOST} in |
| 62 |
+ *-solaris* | *-*bsd* | *-linux-gnu) |
| 63 |
+ append-ldflags -Wl,--no-as-needed |
| 64 |
+ ;; |
| 65 |
+ esac |
| 66 |
|
| 67 |
# peruser MPM debugging with -X is nearly impossible |
| 68 |
if has peruser ${IUSE_MPMS} && use apache2_mpms_peruser ; then |
Archives