Commit 62efd41a authored by Timothy Stack's avatar Timothy Stack

Get the perl event library to compile on fedora core.

parent fb36443f
...@@ -34,6 +34,7 @@ CFLAGS_NOWARN += -O2 -g -static -I. ...@@ -34,6 +34,7 @@ CFLAGS_NOWARN += -O2 -g -static -I.
CFLAGS_NOWARN += `$(ELVIN_CONFIG) --cflags vin4c` CFLAGS_NOWARN += `$(ELVIN_CONFIG) --cflags vin4c`
ifeq ($(SYSTEM),Linux) ifeq ($(SYSTEM),Linux)
PCORE = -I/usr/lib/perl5/5.6.1/i386-linux/CORE PCORE = -I/usr/lib/perl5/5.6.1/i386-linux/CORE
PCORE += -I/usr/lib/perl5/5.8.3/i386-linux-thread-multi/CORE
PCORE += -I/usr/lib/perl5/5.8.6/i386-linux-thread-multi/CORE PCORE += -I/usr/lib/perl5/5.8.6/i386-linux-thread-multi/CORE
PYCORE = -I@PYTHON_INCLUDE@ PYCORE = -I@PYTHON_INCLUDE@
else else
...@@ -46,6 +47,12 @@ PYCORE = -I@PYTHON_INCLUDE@ ...@@ -46,6 +47,12 @@ PYCORE = -I@PYTHON_INCLUDE@
endif endif
endif endif
# PERL_POLLUTE gets us sv_undef on newer versions of perl
PCORE += -DPERL_POLLUTE
# This is needed when trying to compile code generated by swig 1.3
# PCORE += `perl -e 'use Config; print $$Config{ccflags}'`
OBJS = event.o util.o OBJS = event.o util.o
POBJS = event_r.o util.o POBJS = event_r.o util.o
...@@ -79,9 +86,8 @@ util.o: util.c ...@@ -79,9 +86,8 @@ util.o: util.c
# instructions # instructions
# #
swig-wrappers: event.i event.c event.pm.tail swig-wrappers: event.i event.c event.pm.tail
swig1.1 -exportall -dnone -perl5 -shadow -I$(SRCDIR) $(SRCDIR)/event.i swig -exportall -perl5 -shadow -I$(SRCDIR) $(SRCDIR)/event.i
cat $(SRCDIR)/event.pm.tail >> event.pm cat $(SRCDIR)/event.pm.tail >> $(SRCDIR)/event.pm
mv event.pm $(SRCDIR)
event_wrap.o: $(SRCDIR)/event_wrap.c event_wrap.o: $(SRCDIR)/event_wrap.c
$(CC) -c $(CFLAGS_NOWARN) $(PCORE) $< $(CC) -c $(CFLAGS_NOWARN) $(PCORE) $<
......
...@@ -62,7 +62,7 @@ extern "C" { ...@@ -62,7 +62,7 @@ extern "C" {
/***************************************************************************** /*****************************************************************************
* $Header: /home/cvs_mirrors/cvs-public.flux.utah.edu/CVS/testbed/event/lib/event_wrap.c,v 1.5 2003-11-10 17:20:04 ricci Exp $ * $Header: /home/cvs_mirrors/cvs-public.flux.utah.edu/CVS/testbed/event/lib/event_wrap.c,v 1.6 2006-02-01 01:08:49 stack Exp $
* *
* perl5ptr.swg * perl5ptr.swg
* *
...@@ -96,7 +96,10 @@ extern "C" { ...@@ -96,7 +96,10 @@ extern "C" {
* SWIGSTATIC. * SWIGSTATIC.
* *
* $Log: event_wrap.c,v $ * $Log: event_wrap.c,v $
* Revision 1.5 2003-11-10 17:20:04 ricci * Revision 1.6 2006-02-01 01:08:49 stack
* Get the perl event library to compile on fedora core.
*
* Revision 1.5 2003/11/10 17:20:04 ricci
* New versions of the perl even library, to bring it up to date with * New versions of the perl even library, to bring it up to date with
* Leigh's recent security enhancements. * Leigh's recent security enhancements.
* *
...@@ -427,7 +430,11 @@ static void _swig_create_magic(CPerl *pPerl, SV *sv, char *name, int (CPerl::*se ...@@ -427,7 +430,11 @@ static void _swig_create_magic(CPerl *pPerl, SV *sv, char *name, int (CPerl::*se
extern "C" extern "C"
#endif #endif
#ifndef PERL_OBJECT #ifndef PERL_OBJECT
# ifdef pTHX_
SWIGEXPORT(void,boot_event)(pTHX_ CV* cv);
# else
SWIGEXPORT(void,boot_event)(CV* cv); SWIGEXPORT(void,boot_event)(CV* cv);
# endif
#else #else
SWIGEXPORT(void,boot_event)(CPerl *, CV *cv); SWIGEXPORT(void,boot_event)(CPerl *, CV *cv);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment