Date: Sat, 27 Aug 2011 15:17:42 GMT From: Valery Komarov <komarov@valerka.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160233: [patch][update] devel/pinba_engine Update to new revision & FIX: build with MYSQL >= 51 Message-ID: <201108271517.p7RFHgdG028307@red.freebsd.org> Resent-Message-ID: <201108271520.p7RFKC5R030955@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160233 >Category: ports >Synopsis: [patch][update] devel/pinba_engine Update to new revision & FIX: build with MYSQL >= 51 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 27 15:20:11 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Valery Komarov >Release: >Organization: >Environment: >Description: Update to new revision FIX: build with MYSQL >= 51 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN ./pinba_engine.orig/Makefile pinba_engine/Makefile --- ./pinba_engine.orig/Makefile 2011-03-19 16:15:21.000000000 +0300 +++ pinba_engine/Makefile 2011-08-27 19:03:32.000000000 +0400 @@ -6,12 +6,15 @@ # PORTNAME= pinba_engine -PORTVERSION= 2009.12.24 +PORTVERSION= 2011.08.18 PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= http://aston2.com/~raven/unix/pinba/ \ - http://mks-chel.ru/~raven/FreeBSD/pinba/ -DISTNAME= pinba_engine-200912240755 + +MASTER_SITES= https://github.com/tony2001/pinba_engine/tarball/${GITVERSION}/ +DISTNAME= tony2001-pinba_engine-${GITVERSION} + +GITVERSION= 3a0cb51 +FETCH_ARGS= -pRr MAINTAINER= raven428@gmail.com COMMENT= Mysql-engine part of statistics server for PHP @@ -24,16 +27,24 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_MYSQL= yes -WANT_MYSQL_VER= 51 +IGNORE_WITH_MYSQL= 323 40 41 50 + MYSQL_PORTDIR= ${PORTSDIR}/databases/mysql${MYSQL_VER}-server MYSQL_WRKSRC= $$(cd ${MYSQL_PORTDIR} && ${MAKE} -V WRKSRC) +USE_GMAKE= yes GNU_CONFIGURE= yes +USE_AUTOTOOLS= aclocal autoheader automake autoconf libtoolize +USE_LDCONFIG= ${PREFIX}/lib/mysql/plugin + +AUTOMAKE_ARGS+= --add-missing --copy --force-missing +LIBTOOLIZE_ARGS+= --force --copy +ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal + CONFIGURE_ARGS+= \ --with-mysql=${MYSQL_WRKSRC} \ --libdir=${PREFIX}/lib/mysql/plugin CFLAGS+= -I${LOCALBASE}/include/mysql -USE_LDCONFIG= ${PREFIX}/lib/mysql/plugin SUB_FILES= pkg-message .if !defined(NOPORTDOCS) diff -ruN ./pinba_engine.orig/distinfo pinba_engine/distinfo --- ./pinba_engine.orig/distinfo 2011-07-03 18:58:30.000000000 +0400 +++ pinba_engine/distinfo 2011-08-27 18:03:42.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (pinba_engine-200912240755.tar.gz) = 5822a7859e86e24796531a002aa3e866e98a83e6fdf7726356dd5f8ab311f082 -SIZE (pinba_engine-200912240755.tar.gz) = 607588 +SHA256 (tony2001-pinba_engine-3a0cb51.tar.gz) = 73a98a8b8ea4485857b730da11b9842efe73b9af37650120a3b255cbc866c081 +SIZE (tony2001-pinba_engine-3a0cb51.tar.gz) = 50033 diff -ruN ./pinba_engine.orig/files/patch-src__ha_pinba.cc pinba_engine/files/patch-src__ha_pinba.cc --- ./pinba_engine.orig/files/patch-src__ha_pinba.cc 2010-01-08 02:52:46.000000000 +0300 +++ pinba_engine/files/patch-src__ha_pinba.cc 2011-08-27 18:58:15.000000000 +0400 @@ -1,6 +1,34 @@ ---- ./src/ha_pinba.cc.orig 2009-12-23 23:55:04.000000000 -0500 -+++ ./src/ha_pinba.cc 2010-01-07 16:22:50.000000000 -0500 -@@ -283,6 +283,7 @@ +--- ./src/ha_pinba.cc.orig 2011-07-26 18:52:53.000000000 +0400 ++++ ./src/ha_pinba.cc 2011-08-27 18:58:00.000000000 +0400 +@@ -45,6 +45,10 @@ + + #include "ha_pinba.h" + ++#ifdef PINBA_ENGINE_HAVE_PTHREAD_SETAFFINITY_NP ++#include <pthread_np.h> ++#endif ++ + #ifdef PINBA_ENGINE_MYSQL_VERSION_5_5 + # define pinba_free(a, b) my_free(a) + #else +@@ -427,13 +431,13 @@ + unsigned long mask; + + mask = 1; +- pthread_setaffinity_np(collector_thread, sizeof(mask), (cpu_set_t *)&mask); ++ pthread_setaffinity_np(collector_thread, sizeof(mask), (cpuset_t *)&mask); + + mask = 2; +- pthread_setaffinity_np(data_thread, sizeof(mask), (cpu_set_t *)&mask); ++ pthread_setaffinity_np(data_thread, sizeof(mask), (cpuset_t *)&mask); + + mask = 4; +- pthread_setaffinity_np(stats_thread, sizeof(mask), (cpu_set_t *)&mask); ++ pthread_setaffinity_np(stats_thread, sizeof(mask), (cpuset_t *)&mask); + #endif + } + +@@ -452,6 +456,7 @@ int error = 0; DBUG_ENTER("pinba_engine_shutdown"); diff -ruN ./pinba_engine.orig/files/pkg-message.in pinba_engine/files/pkg-message.in --- ./pinba_engine.orig/files/pkg-message.in 2010-01-08 02:52:46.000000000 +0300 +++ pinba_engine/files/pkg-message.in 2011-08-27 19:08:16.000000000 +0400 @@ -1,6 +1,7 @@ +================================================================== After you've installed the plugin, you need to enable it in MySQL. To do this log in to the MySQL console (as root) and execute the -following: +following: mysql> INSTALL PLUGIN pinba SONAME 'libpinba_engine.so'; We'd also suggest you to create a separate database, this way: @@ -8,3 +9,4 @@ And then create the default tables: mysql -D pinba < %%DATADIR%%/default_tables.sql +================================================================== >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108271517.p7RFHgdG028307>