summaryrefslogtreecommitdiff
path: root/lang/swi-prolog-lite
diff options
context:
space:
mode:
authortnn <tnn>2009-10-31 19:34:31 +0000
committertnn <tnn>2009-10-31 19:34:31 +0000
commit9d4416e104b23437398948eec2cede9ad63203d9 (patch)
tree263111dd5006161e3ccdafd998faab8291f4d249 /lang/swi-prolog-lite
parent3fe93a2cb9b3d0cb06545d795987e3b31682aceb (diff)
downloadpkgsrc-9d4416e104b23437398948eec2cede9ad63203d9.tar.gz
avoid conflict with native popcount64(3)
Diffstat (limited to 'lang/swi-prolog-lite')
-rw-r--r--lang/swi-prolog-lite/distinfo3
-rw-r--r--lang/swi-prolog-lite/patches/patch-ao22
2 files changed, 24 insertions, 1 deletions
diff --git a/lang/swi-prolog-lite/distinfo b/lang/swi-prolog-lite/distinfo
index 3fba04826ce..d30a0c6c9ee 100644
--- a/lang/swi-prolog-lite/distinfo
+++ b/lang/swi-prolog-lite/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/10/13 07:54:31 rillig Exp $
+$NetBSD: distinfo,v 1.8 2009/10/31 19:34:31 tnn Exp $
SHA1 (swi-prolog/pl-5.6.17.tar.gz) = e46e98b3ec8a69de3dc2eb147a9df9cbd1a17399
RMD160 (swi-prolog/pl-5.6.17.tar.gz) = 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = e767d69287f5b649048a5a6081061522c06edc18
SHA1 (patch-al) = 14d6309b71c0cc1f67967f2692db6ca075384def
SHA1 (patch-am) = 008c1ae8324522b185a7bf1dd07c7446dfcf2f31
SHA1 (patch-an) = 606f076c41c3020b5c7d0730317d709220c05d4b
+SHA1 (patch-ao) = f57df2c1d1be9e7d91ded9b053a7f3cbc3af9eb6
diff --git a/lang/swi-prolog-lite/patches/patch-ao b/lang/swi-prolog-lite/patches/patch-ao
new file mode 100644
index 00000000000..fa9ad7db952
--- /dev/null
+++ b/lang/swi-prolog-lite/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2009/10/31 19:34:31 tnn Exp $
+
+--- src/pl-arith.c.orig 2009-10-31 20:31:13.000000000 +0100
++++ src/pl-arith.c
+@@ -1752,7 +1752,7 @@ ar_lsb(Number n1, Number r)
+
+
+ static int
+-popcount64(int64_t i)
++popcount64_(int64_t i)
+ { int c, j;
+ int64_t m = LL(1);
+
+@@ -1775,7 +1775,7 @@ ar_popcount(Number n1, Number r)
+ if ( n1->value.i < 0 )
+ return notLessThanZero("popcount", 1, n1);
+
+- r->value.i = popcount64(n1->value.i);
++ r->value.i = popcount64_(n1->value.i);
+ r->type = V_INTEGER;
+ succeed;
+ #ifdef O_GMP