Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_gnutls/files/
Date: Tue, 14 Feb 2017 12:36:35
Message-Id: 1487075784.371879edc620bd68741fc2c1c2b8c8af489dec60.polynomial-c@gentoo
1 commit: 371879edc620bd68741fc2c1c2b8c8af489dec60
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 13 18:09:51 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 14 12:36:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371879ed
7
8 www-apache/mod_gnutls: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/3960
11
12 .../mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch | 31 ----------------------
13 1 file changed, 31 deletions(-)
14
15 diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch
16 deleted file mode 100644
17 index bc95fee5d5..0000000000
18 --- a/www-apache/mod_gnutls/files/mod_gnutls-0.7.1-apr_memcache_m4_dirty.patch
19 +++ /dev/null
20 @@ -1,31 +0,0 @@
21 ---- mod_gnutls-0.7.1/m4/apr_memcache.m4
22 -+++ mod_gnutls-0.7.1/m4/apr_memcache.m4
23 -@@ -40,23 +40,20 @@
24 - if test -n "$apr_memcache_includes"; then
25 - apr_memcache_includedir=$apr_memcache_includes
26 - elif test -n "$apr_memcache_prefix"; then
27 -- apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
28 -+ apr_memcache_includedir=$apr_memcache_prefix/include/aprutil-1
29 - else
30 -- apr_memcache_includedir=$includedir/apr_memcache-0
31 -+ apr_memcache_includedir=$includedir/aprutil-1
32 - fi
33 -
34 - CFLAGS="-I$apr_memcache_includedir $CFLAGS"
35 -
36 -
37 - AC_CHECK_LIB(
38 -- apr_memcache,
39 -+ aprutil-1,
40 - apr_memcache_create,
41 - [
42 -- APR_MEMCACHE_LIBS="-lapr_memcache"
43 -- if test -n "$apr_memcache_libdir"; then
44 -- APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS"
45 -- fi
46 -- APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir"
47 -+ APR_MEMCACHE_LIBS="`apu-1-config --link-ld`"
48 -+ APR_MEMCACHE_CFLAGS="`apu-1-config --includes`"
49 - ]
50 - )
51 -