RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 14-Apr-2009 20:18:18
Branch: HEAD Handle: 2009041418181701
Modified files:
rpm CHANGES
rpm/rpmio rpmperl.c
Log:
- perl: add use RPM; so that perl bindings are available.
Summary:
Revision Changes Path
1.2927 +1 -0 rpm/CHANGES
2.6 +6 -24 rpm/rpmio/rpmperl.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2926 -r1.2927 CHANGES
--- rpm/CHANGES 13 Apr 2009 19:13:26 -0000 1.2926
+++ rpm/CHANGES 14 Apr 2009 18:18:17 -0000 1.2927
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+ - jbj: perl: add use RPM; so that perl bindings are available.
5.2a3 -> 5.2a4:
- rse: fix building without BZip2
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmperl.c
============================================================================
$ cvs diff -u -r2.5 -r2.6 rpmperl.c
--- rpm/rpmio/rpmperl.c 13 Apr 2009 18:07:31 -0000 2.5
+++ rpm/rpmio/rpmperl.c 14 Apr 2009 18:18:18 -0000 2.6
@@ -46,46 +46,28 @@
return (rpmperl) rpmioGetPool(pool, sizeof(*perl));
}
-#if defined(NOTYET)
-EXTERN_C void xs_init (pTHX);
+#if defined(WITH_PERLEMBED)
+EXTERN_C void xs_init (PerlInterpreter * _my_perl PERL_UNUSED_DECL);
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
+EXTERN_C void boot_DynaLoader (PerlInterpreter* _my_perl, CV* cv);
EXTERN_C void
-xs_init(pTHX)
+xs_init(PerlInterpreter* _my_perl PERL_UNUSED_DECL)
{
char *file = __FILE__;
dXSUB_SYS;
/* DynaLoader is a special case */
- newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
+ Perl_newXS(_my_perl, "DynaLoader::boot_DynaLoader", boot_DynaLoader,
file);
}
/*...@unchecked@*/
static const char * rpmperlInitStringIO = "\
-use RPM::Constant;\n\
-use RPM::Header;\n\
-use RPM::Transaction;\n\
-use RPM::PackageIterator;\n\
-use RPM::Problems;\n\
-use RPM::Files;\n\
-use RPM::Dependencies;\n\
-use RPM::Spec;\n\
-use IO::String;\n\
-$io = IO::String->new;\n\
-select $io;\n\
-";
-#else
-#define xs_init NULL
-#if defined(WITH_PERLEMBED)
-/*...@unchecked@*/
-static const char * rpmperlInitStringIO = "\
+use RPM;\n\
use IO::String;\n\
$io = IO::String->new;\n\
select $io;\n\
";
-
-#endif
#endif
rpmperl rpmperlNew(const char * fn, int flags)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
