blueness 14/05/26 17:26:25 Added: monkeyd-1.5.0-use-system-jemalloc.patch monkeyd-1.5.0-fix-CPPFLAGS.patch Log: Version bump (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.1 www-servers/monkeyd/files/monkeyd-1.5.0-use-system-jemalloc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/files/monkeyd-1.5.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.5.0-use-system-jemalloc.patch?rev=1.1&content-type=text/plain Index: monkeyd-1.5.0-use-system-jemalloc.patch =================================================================== diff -Naur monkey-1.5.0.orig/configure monkey-1.5.0/configure --- monkey-1.5.0.orig/configure 2014-05-25 19:12:44.000000000 -0400 +++ monkey-1.5.0/configure 2014-05-26 12:32:16.370879609 -0400 @@ -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 plugins/Make.common" create_plugins_make_common bindir @@ -210,33 +210,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" @@ -316,12 +295,6 @@ # Create Makefile create_makefile1() { - if [ $malloc_jemalloc -eq 1 ]; then - $deps="deps/jemalloc" - else - $deps="" - fi - cat > Makefile << EOF # Monkey HTTP Daemon: Makefile # ============================ @@ -459,13 +432,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 @@ -523,10 +489,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) @@ -605,9 +567,7 @@ fi if [ $malloc_jemalloc -eq 1 ]; then - extra="../deps/jemalloc/lib/libjemalloc.a" - extraso="-Wl,--whole-archive ../deps/jemalloc/lib/libjemalloc_pic.a -Wl,--no-whole-archive" - libs="$libs -lm" + libs="$libs -ljemalloc" fi cat > src/Makefile<<EOF diff -Naur monkey-1.5.0.orig/src/include/mk_memory.h monkey-1.5.0/src/include/mk_memory.h --- monkey-1.5.0.orig/src/include/mk_memory.h 2014-05-25 19:12:44.000000000 -0400 +++ monkey-1.5.0/src/include/mk_memory.h 2014-05-26 12:31:07.103883668 -0400 @@ -23,7 +23,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" 1.1 www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/files/monkeyd-1.5.0-fix-CPPFLAGS.patch?rev=1.1&content-type=text/plain Index: monkeyd-1.5.0-fix-CPPFLAGS.patch =================================================================== diff -Naur monkey-1.5.0.orig/plugins/auth/tools/Makefile.in monkey-1.5.0/plugins/auth/tools/Makefile.in --- monkey-1.5.0.orig/plugins/auth/tools/Makefile.in 2014-05-25 19:12:44.000000000 -0400 +++ monkey-1.5.0/plugins/auth/tools/Makefile.in 2014-05-26 13:15:29.347727637 -0400 @@ -3,10 +3,11 @@ CC = @echo " CC $(_PATH)/$@"; $CC CC_QUIET= @echo -n; $CC -CFLAGS = -I../../../src/include -I../ $CFLAGS +CPPFLAGS = -I../../../src/include -I../ +CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS SOURCES = ../sha1.c ../base64.c mk_passwd.c OBJECTS = $(SOURCES:../.c=%.o) ../../../bin/mk_passwd: $(OBJECTS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl