From: | "Anthony G. Basile (blueness)" <blueness@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/curl/files: curl-7.27.0-prefix.patch curl-7.27.0-curl-config.patch |
Date: | Tue, 31 Jul 2012 21:14:47 |
Message-Id: | 20120731211435.4A5862004B@flycatcher.gentoo.org |
1 | blueness 12/07/31 21:14:35 |
2 | |
3 | Modified: curl-7.27.0-prefix.patch |
4 | Added: curl-7.27.0-curl-config.patch |
5 | Log: |
6 | Fix bug #429100 |
7 | |
8 | (Portage version: 2.1.10.65/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.3 net-misc/curl/files/curl-7.27.0-prefix.patch |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?rev=1.3&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?rev=1.3&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?r1=1.2&r2=1.3 |
16 | |
17 | Index: curl-7.27.0-prefix.patch |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch,v |
20 | retrieving revision 1.2 |
21 | retrieving revision 1.3 |
22 | diff -u -r1.2 -r1.3 |
23 | --- curl-7.27.0-prefix.patch 31 Jul 2012 12:29:29 -0000 1.2 |
24 | +++ curl-7.27.0-prefix.patch 31 Jul 2012 21:14:35 -0000 1.3 |
25 | @@ -7,9 +7,9 @@ |
26 | fi |
27 | - if test "X@includedir@" = "X/usr/include"; then |
28 | + if test "X@includedir@" = "X@GENTOO_PORTAGE_EPREFIX@/usr/include"; then |
29 | - echo "$(CPPFLAG_CURL_STATICLIB)" |
30 | + echo "${CPPFLAG_CURL_STATICLIB}" |
31 | else |
32 | - echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@" |
33 | + echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" |
34 | @@ -142,7 +142,7 @@ |
35 | ;; |
36 | |
37 | |
38 | |
39 | |
40 | 1.1 net-misc/curl/files/curl-7.27.0-curl-config.patch |
41 | |
42 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-curl-config.patch?rev=1.1&view=markup |
43 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-curl-config.patch?rev=1.1&content-type=text/plain |
44 | |
45 | Index: curl-7.27.0-curl-config.patch |
46 | =================================================================== |
47 | diff -Naur curl-7.27.0.orig/curl-config.in curl-7.27.0/curl-config.in |
48 | --- curl-7.27.0.orig/curl-config.in 2012-05-25 23:56:17.000000000 +0200 |
49 | +++ curl-7.27.0/curl-config.in 2012-07-31 22:07:36.539655495 +0200 |
50 | @@ -135,9 +135,9 @@ |
51 | CPPFLAG_CURL_STATICLIB="" |
52 | fi |
53 | if test "X@includedir@" = "X/usr/include"; then |
54 | - echo "$(CPPFLAG_CURL_STATICLIB)" |
55 | + echo "${CPPFLAG_CURL_STATICLIB}" |
56 | else |
57 | - echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@" |
58 | + echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@" |
59 | fi |
60 | ;; |