diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-06-01 11:47:46 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-06-01 11:47:46 +0000 |
| commit | e9f93aa1ade286d86c244c3b3333e4ce5f360fd6 (patch) | |
| tree | 2155082676c54e99bde960a306029012abcddbfc | |
| parent | c02c5a34994abc26925269d2ecb5737a6c32292f (diff) | |
| download | perl-URPM-e9f93aa1ade286d86c244c3b3333e4ce5f360fd6.tar perl-URPM-e9f93aa1ade286d86c244c3b3333e4ce5f360fd6.tar.gz perl-URPM-e9f93aa1ade286d86c244c3b3333e4ce5f360fd6.tar.bz2 perl-URPM-e9f93aa1ade286d86c244c3b3333e4ce5f360fd6.tar.xz perl-URPM-e9f93aa1ade286d86c244c3b3333e4ce5f360fd6.zip | |
It's nice to be able to compile with rpm 4.4.6, but it's nice to be able to
compile with older rpms too.
| -rw-r--r-- | Makefile.PL | 3 | ||||
| -rw-r--r-- | URPM.xs | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.PL b/Makefile.PL index de6e71d..8ec2248 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -50,6 +50,9 @@ my $ccflags = '-Wall -fno-strict-aliasing'; if ($version =~ /^4\.(4\.[5-9]$|4\.\d\d|[5-9]\.|\d\d)/) { $ccflags .= ' -DRPM_CALLBACK_LONGLONG'; } +if ($version eq '4.4.6') { + $ccflags .= ' -DRPM_446'; +} WriteMakefile( NAME => 'URPM', @@ -26,7 +26,9 @@ #undef Fflush #undef Mkdir #undef Stat -#define _RPMPS_INTERNAL +#ifdef RPM_446 +# define _RPMPS_INTERNAL +#endif #include <rpm/rpmlib.h> #include <rpm/header.h> #include <rpm/rpmio.h> @@ -2820,7 +2822,6 @@ Trans_add(trans, pkg, ...) if ((pkg->flag & FLAG_ID) <= FLAG_ID_MAX && pkg->h != NULL) { int update = 0; rpmRelocation *relocations = NULL; - rpmRelocation relptr = NULL; /* compability mode with older interface of add */ if (items == 3) { update = SvIV(ST(2)); @@ -2840,8 +2841,12 @@ Trans_add(trans, pkg, ...) while (--j >= 0) { SV **e = av_fetch(excludepath, j, 0); if (e != NULL && *e != NULL) { - relptr = *(relocations + j); +#ifdef RPM_446 + rpmRelocation relptr = relocations[j]; relptr->oldPath = SvPV_nolen(*e); +#else + relocations[j].oldPath = SvPV_nolen(*e); +#endif } } } |