diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2014-02-06 16:12:25 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-02-06 16:12:25 +0000 |
| commit | 3242916d897d1ad0de45e15862c1886a56f65129 (patch) | |
| tree | 326644206a94d977f3bafa64ee60878603a88bb0 /www-servers/monkeyd | |
| parent | fix missing multilib usedep on virtual/opengl, for libva-1.2.1 and libva-9999... (diff) | |
| download | gentoo-2-3242916d897d1ad0de45e15862c1886a56f65129.tar.gz gentoo-2-3242916d897d1ad0de45e15862c1886a56f65129.tar.bz2 gentoo-2-3242916d897d1ad0de45e15862c1886a56f65129.zip | |
Fix system-jemalloc patch
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'www-servers/monkeyd')
| -rw-r--r-- | www-servers/monkeyd/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch (renamed from www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch) | 24 |
2 files changed, 18 insertions, 13 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog index 07579974fc3e..a552f68ed874 100644 --- a/www-servers/monkeyd/ChangeLog +++ b/www-servers/monkeyd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/monkeyd # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.67 2014/02/05 13:46:33 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.68 2014/02/06 16:12:25 blueness Exp $ + + 06 Feb 2014; Anthony G. Basile <blueness@gentoo.org> + +files/monkeyd-1.4.0-use-system-jemalloc.patch, + -files/monkey-1.4.0-use-system-jemalloc.patch: + Fix system-jemalloc patch *monkeyd-1.4.0 (05 Feb 2014) diff --git a/www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch b/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch index 502b90b3c58b..70d6ad95337d 100644 --- a/www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch +++ b/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch @@ -1,6 +1,6 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure ---- monkey-1.4.0.orig/configure 2014-02-05 08:38:13.223712041 -0500 -+++ monkey-1.4.0/configure 2014-02-05 08:37:19.575716331 -0500 +--- monkey-1.4.0.orig/configure 2014-02-04 09:04:22.000000000 -0500 ++++ monkey-1.4.0/configure 2014-02-06 11:07:21.094086218 -0500 @@ -193,7 +193,7 @@ echo "+ Creating src/Makefile" @@ -10,7 +10,7 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure echo "+ Creating src/include/mk_info.h" create_info sysconfdir \ -@@ -203,33 +203,12 @@ +@@ -205,33 +205,12 @@ echo -e "+ Creating Makefile" if [ "$dir" = 0 ]; then @@ -46,7 +46,7 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure echo echo -e "\033[1m=== Monkey Configuration ===\033[0m" echo -e "Platform\t= $platform" -@@ -306,12 +285,6 @@ +@@ -308,12 +287,6 @@ # Create Makefile create_makefile1() { @@ -59,7 +59,7 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure cat > Makefile << EOF # Monkey HTTP Daemon: Makefile # ============================ -@@ -449,13 +422,6 @@ +@@ -451,13 +424,6 @@ create_makefile1_install() { @@ -73,18 +73,18 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure # remove old data rm -rf plugins.conf plugins.list touch plugins.conf -@@ -506,10 +472,6 @@ - @\$(MAKE) -C plugins all +@@ -508,10 +474,6 @@ + @\$(MAKE) -s -C plugins all @echo " DONE" -jemalloc: - @echo " CC jemalloc [all]" -- @\$(MAKE) -C deps/jemalloc +- @\$(MAKE) -s -C deps/jemalloc - clean: @(cd src; \$(MAKE) clean) @(cd plugins; \$(MAKE) clean) -@@ -587,8 +549,7 @@ +@@ -589,8 +551,7 @@ fi if [ $malloc_jemalloc -eq 1 ]; then @@ -96,14 +96,14 @@ diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure cat > src/Makefile<<EOF diff -Naur monkey-1.4.0.orig/src/include/mk_memory.h monkey-1.4.0/src/include/mk_memory.h --- monkey-1.4.0.orig/src/include/mk_memory.h 2014-02-04 09:04:22.000000000 -0500 -+++ monkey-1.4.0/src/include/mk_memory.h 2014-02-05 08:37:55.403713466 -0500 ++++ monkey-1.4.0/src/include/mk_memory.h 2014-02-06 11:06:52.298088521 -0500 @@ -25,7 +25,8 @@ #include <stdio.h> #ifdef MALLOC_JEMALLOC -#include "../../deps/jemalloc/include/jemalloc/jemalloc.h" -+#include <jemalloc.h> -+#include <jemalloc_defs.h> ++#include <jemalloc/jemalloc.h> ++#include <jemalloc/jemalloc_defs.h> #endif #include "mk_macros.h" |