Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/apache: apache-2.4.7.ebuild ChangeLog
Date: Fri, 31 Jan 2014 08:31:04
Message-Id: 20140131083100.68AA92004C@flycatcher.gentoo.org
1 vapier 14/01/31 08:31:00
2
3 Modified: apache-2.4.7.ebuild ChangeLog
4 Log:
5 Add workaround for gen_test_char behavior when cross-compiling #385783 by Bertrand Jacquin.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.5 www-servers/apache/apache-2.4.7.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild?r1=1.4&r2=1.5
15
16 Index: apache-2.4.7.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- apache-2.4.7.ebuild 24 Jan 2014 03:39:51 -0000 1.4
23 +++ apache-2.4.7.ebuild 31 Jan 2014 08:30:59 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.4 2014/01/24 03:39:51 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.5 2014/01/31 08:30:59 vapier Exp $
29
30 EAPI=5
31
32 @@ -157,6 +157,20 @@
33 apache-2_src_configure
34 }
35
36 +src_compile() {
37 + if tc-is-cross-compiler; then
38 + # This header is the same across targets, so use the build compiler.
39 + pushd server >/dev/null
40 + emake gen_test_char
41 + tc-export_build_env BUILD_CC
42 + ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
43 + gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
44 + popd >/dev/null
45 + fi
46 +
47 + default
48 +}
49 +
50 src_install() {
51 apache-2_src_install
52 for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
53
54
55
56 1.255 www-servers/apache/ChangeLog
57
58 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.255&view=markup
59 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?rev=1.255&content-type=text/plain
60 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/apache/ChangeLog?r1=1.254&r2=1.255
61
62 Index: ChangeLog
63 ===================================================================
64 RCS file: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v
65 retrieving revision 1.254
66 retrieving revision 1.255
67 diff -u -r1.254 -r1.255
68 --- ChangeLog 24 Jan 2014 03:39:51 -0000 1.254
69 +++ ChangeLog 31 Jan 2014 08:30:59 -0000 1.255
70 @@ -1,6 +1,10 @@
71 # ChangeLog for www-servers/apache
72 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
73 -# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.254 2014/01/24 03:39:51 vapier Exp $
74 +# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.255 2014/01/31 08:30:59 vapier Exp $
75 +
76 + 31 Jan 2014; Mike Frysinger <vapier@g.o> apache-2.4.7.ebuild:
77 + Add workaround for gen_test_char behavior when cross-compiling #385783 by
78 + Bertrand Jacquin.
79
80 24 Jan 2014; Mike Frysinger <vapier@g.o> apache-2.2.24.ebuild,
81 apache-2.2.25.ebuild, apache-2.2.26.ebuild, apache-2.4.6-r1.ebuild,