Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/nginx: ChangeLog nginx-0.8.29.ebuild nginx-0.7.64.ebuild
Date: Fri, 01 Jan 2010 20:33:17
Message-Id: E1NQoBK-0002mi-Mt@stork.gentoo.org
1 djc 10/01/01 20:33:10
2
3 Modified: ChangeLog nginx-0.8.29.ebuild nginx-0.7.64.ebuild
4 Log:
5 Fix problems with -ssl compilation of www-servers/nginx (see bug 293785).
6 (Portage version: 2.1.6.13/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.232 www-servers/nginx/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.232&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.232&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.231&r2=1.232
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v
18 retrieving revision 1.231
19 retrieving revision 1.232
20 diff -u -r1.231 -r1.232
21 --- ChangeLog 8 Dec 2009 14:49:37 -0000 1.231
22 +++ ChangeLog 1 Jan 2010 20:33:10 -0000 1.232
23 @@ -1,6 +1,10 @@
24 # ChangeLog for www-servers/nginx
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.231 2009/12/08 14:49:37 djc Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.232 2010/01/01 20:33:10 djc Exp $
29 +
30 + 01 Jan 2010; Dirkjan Ochtman <djc@g.o> nginx-0.7.64.ebuild,
31 + nginx-0.8.29.ebuild:
32 + Fix problems with ssl requirements (see bug 293785 for discussion).
33
34 *nginx-0.8.29 (08 Dec 2009)
35 *nginx-0.7.64 (08 Dec 2009)
36
37
38
39 1.2 www-servers/nginx/nginx-0.8.29.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild?r1=1.1&r2=1.2
44
45 Index: nginx-0.8.29.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- nginx-0.8.29.ebuild 8 Dec 2009 14:49:37 -0000 1.1
52 +++ nginx-0.8.29.ebuild 1 Jan 2010 20:33:10 -0000 1.2
53 @@ -1,6 +1,6 @@
54 -# Copyright 1999-2009 Gentoo Foundation
55 +# Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.2 2010/01/01 20:33:10 djc Exp $
59
60 inherit eutils ssl-cert toolchain-funcs
61
62 @@ -14,8 +14,8 @@
63 IUSE="addition debug fastcgi flv imap ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
64
65 DEPEND="dev-lang/perl
66 + dev-libs/openssl
67 pcre? ( >=dev-libs/libpcre-4.2 )
68 - ssl? ( dev-libs/openssl )
69 zlib? ( sys-libs/zlib )
70 perl? ( >=dev-lang/perl-5.8 )"
71
72 @@ -71,6 +71,8 @@
73 tc-export CC
74 ./configure \
75 --prefix=/usr \
76 + --with-cc-opt="-I${ROOT}/usr/include" \
77 + --with-ld-opt="-L${ROOT}/usr/lib" \
78 --conf-path=/etc/${PN}/${PN}.conf \
79 --http-log-path=/var/log/${PN}/access_log \
80 --error-log-path=/var/log/${PN}/error_log \
81 @@ -78,8 +80,6 @@
82 --http-client-body-temp-path=/var/tmp/${PN}/client \
83 --http-proxy-temp-path=/var/tmp/${PN}/proxy \
84 --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
85 - --with-md5-asm --with-md5=/usr/include \
86 - --with-sha1-asm --with-sha1=/usr/include \
87 ${myconf} || die "configure failed"
88
89 emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
90
91
92
93 1.2 www-servers/nginx/nginx-0.7.64.ebuild
94
95 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild?rev=1.2&view=markup
96 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild?rev=1.2&content-type=text/plain
97 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild?r1=1.1&r2=1.2
98
99 Index: nginx-0.7.64.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild,v
102 retrieving revision 1.1
103 retrieving revision 1.2
104 diff -u -r1.1 -r1.2
105 --- nginx-0.7.64.ebuild 8 Dec 2009 14:49:37 -0000 1.1
106 +++ nginx-0.7.64.ebuild 1 Jan 2010 20:33:10 -0000 1.2
107 @@ -1,6 +1,6 @@
108 -# Copyright 1999-2009 Gentoo Foundation
109 +# Copyright 1999-2010 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64.ebuild,v 1.2 2010/01/01 20:33:10 djc Exp $
113
114 inherit eutils ssl-cert toolchain-funcs
115
116 @@ -14,8 +14,8 @@
117 IUSE="addition debug fastcgi flv imap pcre perl random-index ssl status sub webdav zlib"
118
119 DEPEND="dev-lang/perl
120 + dev-libs/openssl
121 pcre? ( >=dev-libs/libpcre-4.2 )
122 - ssl? ( dev-libs/openssl )
123 zlib? ( sys-libs/zlib )
124 perl? ( >=dev-lang/perl-5.8 )"
125
126 @@ -64,6 +64,8 @@
127 tc-export CC
128 ./configure \
129 --prefix=/usr \
130 + --with-cc-opt="-I${ROOT}/usr/include" \
131 + --with-ld-opt="-L${ROOT}/usr/lib" \
132 --conf-path=/etc/${PN}/${PN}.conf \
133 --http-log-path=/var/log/${PN}/access_log \
134 --error-log-path=/var/log/${PN}/error_log \
135 @@ -71,8 +73,6 @@
136 --http-client-body-temp-path=/var/tmp/${PN}/client \
137 --http-proxy-temp-path=/var/tmp/${PN}/proxy \
138 --http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
139 - --with-md5-asm --with-md5=/usr/include \
140 - --with-sha1-asm --with-sha1=/usr/include \
141 ${myconf} || die "configure failed"
142
143 emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
Report Message
Find on MARC Find on Google Groups