diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-03-19 22:22:03 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-03-19 22:22:03 +0000 |
| commit | 9dcf1388cd3540460ebe4c584f598eee4b4fe9e4 (patch) | |
| tree | 4e66446cbf0f2f72ded4718c4d05846bb6e9e824 /www-servers/varnish | |
| parent | Prefer motif to athena if both USE flags are set. (diff) | |
| download | gentoo-2-9dcf1388cd3540460ebe4c584f598eee4b4fe9e4.tar.gz gentoo-2-9dcf1388cd3540460ebe4c584f598eee4b4fe9e4.tar.bz2 gentoo-2-9dcf1388cd3540460ebe4c584f598eee4b4fe9e4.zip | |
Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'www-servers/varnish')
| -rw-r--r-- | www-servers/varnish/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/varnish/files/varnish-3.0.3-automagic.patch | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog index 1d04d0b8fcdd..8f1239b3128b 100644 --- a/www-servers/varnish/ChangeLog +++ b/www-servers/varnish/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/varnish # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.56 2013/03/14 15:49:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.57 2013/03/19 22:22:03 blueness Exp $ + + 19 Mar 2013; Anthony G. Basile <blueness@gentoo.org> + files/varnish-3.0.3-automagic.patch: + Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638 *varnish-3.0.3-r1 (14 Mar 2013) diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch index 70ca9f8cb2ee..ba18a3bbbc1c 100644 --- a/www-servers/varnish/files/varnish-3.0.3-automagic.patch +++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch @@ -64,7 +64,7 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac JEMALLOC_LDADD= AC_ARG_WITH([jemalloc], [AS_HELP_STRING([--with-jemalloc], -@@ -279,18 +279,11 @@ +@@ -279,18 +279,13 @@ [], [with_jemalloc=check]) @@ -81,14 +81,16 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac -esac -AC_SUBST(JEMALLOC_SUBDIR) +if test "x$with_jemalloc" != xno; then -+ AC_CHECK_LIB([jemalloc], [jmalloc_conf], ++ AC_CHECK_LIB([jemalloc], [malloc_conf], + [JEMALLOC_LDADD="-ljemalloc"], -+ [AC_MSG_ERROR([No system jemalloc found])]) ++ [AC_CHECK_LIB([jemalloc], [jmalloc_conf], ++ [JEMALLOC_LDADD="-ljemalloc"], ++ [AC_MSG_ERROR([No system jemalloc found])])]) +fi AC_SUBST(JEMALLOC_LDADD) # Userland slab allocator, available only on Solaris -@@ -582,7 +575,6 @@ +@@ -582,7 +577,6 @@ lib/libvcl/Makefile lib/libvgz/Makefile lib/libvmod_std/Makefile @@ -96,7 +98,6 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac man/Makefile redhat/Makefile varnishapi.pc -diff -Naur varnish-3.0.3.orig/lib/Makefile.am varnish-3.0.3/lib/Makefile.am --- varnish-3.0.3.orig/lib/Makefile.am 2012-08-20 05:20:40.000000000 -0400 +++ varnish-3.0.3/lib/Makefile.am 2013-03-14 10:58:39.000000000 -0400 @@ -6,14 +6,12 @@ |