* [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd/files: monkeyd-1.4.0-use-system-jemalloc.patch monkey-1.4.0-use-system-jemalloc.patch
@ 2014-02-06 16:12 Anthony G. Basile (blueness)
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile (blueness) @ 2014-02-06 16:12 UTC (permalink / raw
To: gentoo-commits
blueness 14/02/06 16:12:25
Added: monkeyd-1.4.0-use-system-jemalloc.patch
Removed: monkey-1.4.0-use-system-jemalloc.patch
Log:
Fix system-jemalloc patch
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path
1.1 www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/files/monkeyd-1.4.0-use-system-jemalloc.patch?rev=1.1&content-type=text/plain
Index: monkeyd-1.4.0-use-system-jemalloc.patch
===================================================================
diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure
--- 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"
create_makefile2 mod_libs mod_obj make_script platform \
- malloc_libc malloc_jemalloc
+ malloc_libc
echo "+ Creating src/include/mk_info.h"
create_info sysconfdir \
@@ -205,33 +205,12 @@
echo -e "+ Creating Makefile"
if [ "$dir" = 0 ]; then
- create_makefile1 bindir malloc_jemalloc
+ create_makefile1 bindir
else
create_makefile1_install prefix bindir mandir sysconfdir \
- datadir logdir malloc_jemalloc
+ datadir logdir
fi
- # if the memory allocator is jemalloc, lets start configuring the dependency
- if [ $malloc_jemalloc -eq 1 ]; then
- echo
- echo -e "\033[1m=== Configuring Memory Allocator ===\033[0m"
- cd deps/jemalloc
- ./configure $JEMALLOC_OPTS \
- --with-jemalloc-prefix=je_ \
- --enable-cc-silence \
- CFLAGS="-std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops " \
- LDFLAGS="" > jemalloc.config 2>&1
- if [ $? -eq 0 ]; then
- echo "+ Jemalloc configured"
- else
- cat jemalloc.config
- echo
- echo "check more details with: $ cat deps/jemalloc/config.log"
- exit 1
- fi
- cd ../../
- fi
-
echo
echo -e "\033[1m=== Monkey Configuration ===\033[0m"
echo -e "Platform\t= $platform"
@@ -308,12 +287,6 @@
# Create Makefile
create_makefile1()
{
- if [ $malloc_jemalloc -eq 1 ]; then
- $deps="deps/jemalloc"
- else
- $deps=""
- fi
-
cat > Makefile << EOF
# Monkey HTTP Daemon: Makefile
# ============================
@@ -451,13 +424,6 @@
create_makefile1_install()
{
- # memory allocator
- if [ $malloc_jemalloc -eq 1 ]; then
- all_deps="$all_deps jemalloc"
- else
- deps=""
- fi
-
# remove old data
rm -rf plugins.conf plugins.list
touch plugins.conf
@@ -508,10 +474,6 @@
@\$(MAKE) -s -C plugins all
@echo " DONE"
-jemalloc:
- @echo " CC jemalloc [all]"
- @\$(MAKE) -s -C deps/jemalloc
-
clean:
@(cd src; \$(MAKE) clean)
@(cd plugins; \$(MAKE) clean)
@@ -589,8 +551,7 @@
fi
if [ $malloc_jemalloc -eq 1 ]; then
- extra="../deps/jemalloc/lib/libjemalloc.a"
- libs="$libs -lm"
+ libs="$libs -ljemalloc"
fi
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-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/jemalloc.h>
+#include <jemalloc/jemalloc_defs.h>
#endif
#include "mk_macros.h"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-06 16:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-06 16:12 [gentoo-commits] gentoo-x86 commit in www-servers/monkeyd/files: monkeyd-1.4.0-use-system-jemalloc.patch monkey-1.4.0-use-system-jemalloc.patch Anthony G. Basile (blueness)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox