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 |
Date: | Tue, 31 Jul 2012 12:29:59 |
Message-Id: | 20120731122930.1BACE2004C@flycatcher.gentoo.org |
1 | blueness 12/07/31 12:29:30 |
2 | |
3 | Modified: curl-7.27.0-prefix.patch |
4 | Log: |
5 | Fix bug #428696 |
6 | |
7 | (Portage version: 2.1.10.65/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.2 net-misc/curl/files/curl-7.27.0-prefix.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?rev=1.2&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?rev=1.2&content-type=text/plain |
14 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch?r1=1.1&r2=1.2 |
15 | |
16 | Index: curl-7.27.0-prefix.patch |
17 | =================================================================== |
18 | RCS file: /var/cvsroot/gentoo-x86/net-misc/curl/files/curl-7.27.0-prefix.patch,v |
19 | retrieving revision 1.1 |
20 | retrieving revision 1.2 |
21 | diff -u -r1.1 -r1.2 |
22 | --- curl-7.27.0-prefix.patch 29 Jul 2012 14:46:04 -0000 1.1 |
23 | +++ curl-7.27.0-prefix.patch 31 Jul 2012 12:29:29 -0000 1.2 |
24 | @@ -10,13 +10,12 @@ |
25 | echo "$(CPPFLAG_CURL_STATICLIB)" |
26 | else |
27 | echo "$(CPPFLAG_CURL_STATICLIB)-I@includedir@" |
28 | -@@ -142,7 +142,8 @@ |
29 | +@@ -142,7 +142,7 @@ |
30 | ;; |
31 | |
32 | --libs) |
33 | - if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then |
34 | -+ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; t |
35 | -+hen |
36 | ++ if test "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "X@libdir@" != "X@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then |
37 | CURLLIBDIR="-L@libdir@ " |
38 | else |
39 | CURLLIBDIR="" |