1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix a compilation failure for perl Net::HandlerSocket module

Browse Source
This commit is contained in:
Sergei Golubchik 2011-10-12 14:01:01 +02:00
parent d418175f15
commit 4449d8e380
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bzrignore
View File

@ -1975,3 +1975,8 @@ CPackSourceConfig.cmake
win/nmake_cache.txt win/nmake_cache.txt
*.manifest *.manifest
*.resource.txt *.resource.txt
plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.c
plugin/handler_socket/perl-Net-HandlerSocket/blib
plugin/handler_socket/perl-Net-HandlerSocket/pm_to_blib
plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.bs
plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL

5
plugin/handler_socket/perl-Net-HandlerSocket/HandlerSocket.xs
View File

@ -12,6 +12,11 @@
#include "ppport.h" #include "ppport.h"
/*
below we'll include (indirectly) my_global.h, which defines
VERSION too. Undefine our VERSION here.
*/
#undef VERSION
#include "hstcpcli.hpp" #include "hstcpcli.hpp"
#define DBG(x) #define DBG(x)

4
plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL → plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.in
View File

@ -11,8 +11,8 @@ WriteMakefile(
AUTHOR => 'higuchi dot akira at dena dot jp>') : ()), AUTHOR => 'higuchi dot akira at dena dot jp>') : ()),
CC => 'g++ -fPIC', CC => 'g++ -fPIC',
LD => 'g++ -fPIC', LD => 'g++ -fPIC',
LIBS => ['-L../libhsclient -L../libhsclient/.libs -lhsclient'], LIBS => ['-L@builddir@/../libhsclient -L@builddir@/../libhsclient/.libs -lhsclient'],
DEFINE => '', DEFINE => '',
INC => '-I. -I../libhsclient', INC => '-I. -I../libhsclient -I@builddir@/../libhsclient -I@top_builddir@/include',
OPTIMIZE => '-g -O3 -Wall -Wno-unused', OPTIMIZE => '-g -O3 -Wall -Wno-unused',
); );

2
plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL.installed
View File

@ -13,7 +13,7 @@ WriteMakefile(
LD => 'g++ -fPIC', LD => 'g++ -fPIC',
LIBS => ['-lhsclient'], # e.g., '-lm' LIBS => ['-lhsclient'], # e.g., '-lm'
DEFINE => '', # e.g., '-DHAVE_SOMETHING' DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => '-I. -I/usr/include/handlersocket', INC => '-I. -I/usr/include/handlersocket -I/usr/include/mysql',
OPTIMIZE => '-g -O3 -Wall -Wno-unused', OPTIMIZE => '-g -O3 -Wall -Wno-unused',
# Un-comment this if you add C files to link with later: # Un-comment this if you add C files to link with later:
# OBJECT => '$(O_FILES)', # link all the C files too # OBJECT => '$(O_FILES)', # link all the C files too

1
plugin/handler_socket/plug.in
View File

@ -16,4 +16,5 @@ MYSQL_PLUGIN_ACTIONS(handlersocket,
AC_SUBST(MYSQL_LIB) AC_SUBST(MYSQL_LIB)
AC_SUBST(PLUGIN_DIR) AC_SUBST(PLUGIN_DIR)
AC_SUBST(HANDLERSOCKET_SUBDIRS) AC_SUBST(HANDLERSOCKET_SUBDIRS)
AC_CONFIG_FILES(plugin/handler_socket/perl-Net-HandlerSocket/Makefile.PL)
]) ])