Mirror/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-12 18:59:50 +03:00
Code Issues Wiki Activity

testing/perl-libapreq2: fix incompatible pointer types issue on 32-bit

Browse source
This commit is contained in:
Celeste 2025-06-26 06:28:19 +00:00
parent 86b41d8d29
commit 4d934d454a
2 changed files with 48 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

46
testing/perl-libapreq2/32-bit-incompatible-pointer-types.patch Normal file
View file

@ -0,0 +1,46 @@
Patch-Source: https://salsa.debian.org/debian/libapreq2/-/blob/debian/2.17-7/debian/patches/32-bit-build.patch
--
Description: fix type mismatch of MGVTBL.svt_copy namelen argument
Since Perl 5.12, the type of the namelen argument of the svt_copy member of
MGVTBL struct has changed its type from `int` to `I32`.
.
Perl commit:
https://github.com/Perl/perl5/commit/3468c7eaa8d7687e8ae89928492b408a4d6c752f
.
On 64-bit platforms `int` and `I32` are both 32-bit integers, but on 32-bit
platforms I32 is `long int` and a simple `int` is 16-bit.
Author: Damyan Ivanov <dmn@debian.org>
Forwarded: https://bz.apache.org/bugzilla/show_bug.cgi?id=69346
--- a/glue/perl/xsbuilder/apreq_xs_tables.h
+++ b/glue/perl/xsbuilder/apreq_xs_tables.h
@@ -24,6 +24,11 @@
/**************************************************/
+#if (PERL_VERSION >= 12)
+#define MG_COPY_NAMELEN I32
+#else
+#define MG_COPY_NAMELEN int
+#endif
#if (PERL_VERSION >= 8) /* MAGIC ITERATOR REQUIRES 5.8 */
@@ -42,7 +47,7 @@
*/
static int apreq_xs_cookie_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
- const char *name, int namelen)
+ const char *name, MG_COPY_NAMELEN namelen)
{
/* Prefetch the value whenever the table iterator is > 0 */
MAGIC *tie_magic = mg_find(nsv, PERL_MAGIC_tiedelem);
@@ -151,7 +156,7 @@ static int apreq_xs_cookie_table_values(
*/
static int apreq_xs_param_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
- const char *name, int namelen)
+ const char *name, MG_COPY_NAMELEN namelen)
{
/* Prefetch the value whenever the table iterator is > 0 */
MAGIC *tie_magic = mg_find(nsv, PERL_MAGIC_tiedelem);

2
testing/perl-libapreq2/APKBUILD
View file

@ -15,6 +15,7 @@ makedepends="perl-extutils-xsbuilder perl-dev libtool apache2-dev apache2-mod-pe
source="https://dlcdn.apache.org//httpd/libapreq/libapreq2-$pkgver.tar.gz
libapreq2-2.08-doc.patch
link-in-apr-shared-objects.patch
32-bit-incompatible-pointer-types.patch
$pkgname.conf"
builddir="$srcdir/$_pkgreal-$pkgver"
@ -38,5 +39,6 @@ sha512sums="
89b139b8673145d9e2d8fd77d36f878c519c1deb7f9b853cda2a15d34cbb619d1c5e784ba21553f23c2ef07803f07c75a83d96cd770f80e1b36283a4cbb88999 libapreq2-2.17.tar.gz
dc889d7890d9059efdb3fcd4d6b1e485929b69c073ff6266b90f82e89efe5bdd633fd4dc09ccd4aac3f8816271c00dca69b39ffe4706baf7d3094404784cd766 libapreq2-2.08-doc.patch
04b41c1e0694f53c5164e92c6cd81236f8030a265d9af4f5160c051425c9fa75c6326728734c31fc3f61baa88ae40924ef78974bd3cd2af719cb3bb9bb9428d3 link-in-apr-shared-objects.patch
72f221fa824b8771c50810bf638ae8b9208f0a0f12d6ae642542bf3878786488d970c384b534ca097551d1b1062fb2f0b84e3624f0ff3e659b4c7496e0dbb0b6 32-bit-incompatible-pointer-types.patch
e7fa4f3b51cbc6417369ba171ac0fb955ec0cd6d3575e07e7451ef2a8165d24ddbbcc3143a5c8106a757ecd7d4286a11a9ff87e27c1acff8abc48110fcb02e1f perl-libapreq2.conf
"