diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-03-19 22:22:20 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-03-19 22:22:20 +0000 |
| commit | 3a925d2db75f9c8eb1421e07e4cb3374f6b0d328 (patch) | |
| tree | 7efff03ba88a89c1025f65f3747bb212b6f9575e /www-servers/varnish/files | |
| parent | Prefer motif to athena if both USE flags are set. (diff) | |
| download | historical-3a925d2db75f9c8eb1421e07e4cb3374f6b0d328.tar.gz historical-3a925d2db75f9c8eb1421e07e4cb3374f6b0d328.tar.bz2 historical-3a925d2db75f9c8eb1421e07e4cb3374f6b0d328.zip | |
Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
Diffstat (limited to 'www-servers/varnish/files')
| -rw-r--r-- | www-servers/varnish/files/varnish-3.0.3-automagic.patch | 11 |
1 files changed, 6 insertions, 5 deletions
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 @@ |