Attachment 226707 Details for Bug 257429 – Patch for judy

[patch] Patch for judy

judy-fixup.patch (text/plain), 3.73 KB, created by Daniel Engberg on 2021-07-26 08:50:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2021-07-26 08:50:53 UTC

Size: 3.73 KB

patch

obsolete

>diff --git a/devel/judy/Makefile b/devel/judy/Makefile
>index 5ec3d1cd893d..0fa62305b12d 100644
>--- a/devel/judy/Makefile
>+++ b/devel/judy/Makefile
>@@ -1,10 +1,10 @@
> # Created by: Sergey Skvortsov <skv@protey.ru>
> 
> PORTNAME=	Judy
>-PORTVERSION=	1.0.5
>-PORTREVISION=	2
>+DISTVERSION=	1.0.5
>+PORTREVISION=	3
> CATEGORIES=	devel
>-MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
>+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${DISTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	General purpose dynamic array
>@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
> MAKE_JOBS_UNSAFE=	yes
> INSTALL_TARGET=	install-strip
> 
>-WRKSRC=	${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
>+WRKSRC=	${WRKDIR}/${PORTNAME:tl}-${DISTVERSION}
> 
> PORTDOCS=	COPYRIGHT README *.htm
> 
>diff --git a/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h b/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h
>new file mode 100644
>index 000000000000..1ec54f729247
>--- /dev/null
>+++ b/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h
>@@ -0,0 +1,63 @@
>+--- src/JudyCommon/JudyPrivateBranch.h.orig	2005-02-15 21:06:07 UTC
>++++ src/JudyCommon/JudyPrivateBranch.h
>+@@ -55,7 +55,7 @@ typedef struct J_UDY_POINTER_OTHERS      // JPO.
>+         {
>+             Word_t      j_po_Addr;       // first word:  Pjp_t, Word_t, etc.
>+             union {
>+-//              Word_t  j_po_DcdPop0:cJU_BITSPERWORD-cJU_BITSPERBYTE;
>++                Word_t  j_po_Addr1;
>+                 uint8_t j_po_DcdP0[sizeof(Word_t) - 1];
>+                 uint8_t j_po_Bytes[sizeof(Word_t)];     // last byte = jp_Type.
>+             } jpo_u;
>+@@ -78,13 +78,18 @@ typedef struct J_UDY_POINTER_OTHERS      // JPO.
>+ // TBD:  Revise this structure to not overload j_po_DcdPopO this way?  The
>+ // current arrangement works, its just confusing.
>+ 
>+-typedef struct _JUDY_POINTER_IMMED      // JPI.
>++typedef struct _JUDY_POINTER_IMMEDL  
>+         {
>+-            uint8_t j_pi_1Index[sizeof(Word_t)];        // see above.
>+-            uint8_t j_pi_LIndex[sizeof(Word_t) - 1];    // see above.
>+-            uint8_t j_pi_Type;                  // JP type, 1 of cJ*_JPIMMED*.
>+-        } jpi_t;
>++            Word_t  j_pL_Addr;
>++            uint8_t j_pL_LIndex[sizeof(Word_t) - 1];    // see above.
>++            uint8_t j_pL_Type;
>++        } jpL_t;
>+ 
>++typedef struct _JUDY_POINTER_IMMED1   
>++        {
>++            uint8_t j_p1_1Index[(2 * sizeof(Word_t)) - 1];
>++            uint8_t j_p1_Type;
>++        } jp1_t;
>+ 
>+ // UNION OF JP TYPES:
>+ //
>+@@ -96,18 +101,22 @@ typedef struct _JUDY_POINTER_IMMED      // JPI.
>+ typedef union J_UDY_POINTER             // JP.
>+         {
>+             jpo_t j_po;                 // other than immediate indexes.
>+-            jpi_t j_pi;                 // immediate indexes.
>++            jpL_t j_pL;                 // immediate indexes.
>++            jp1_t j_p1;                 // immediate indexes.
>+         } jp_t, *Pjp_t;
>+ 
>+ // For coding convenience:
>+ //
>+-// Note, jp_Type has the same bits in jpo_t and jpi_t.
>++// Note, jp_Type has the same bits in jpo_t jpL_t and jp1_t.
>+ 
>+-#define jp_1Index  j_pi.j_pi_1Index     // for storing Indexes in first  word.
>+-#define jp_LIndex  j_pi.j_pi_LIndex     // for storing Indexes in second word.
>++#define jp_1Index  j_p1.j_p1_1Index     // for storing Indexes in first  word.
>++#define jp_LIndex  j_pL.j_pL_LIndex     // for storing Indexes in second word.
>+ #define jp_Addr    j_po.j_po_Addr
>++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
>+ //#define       jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0
>+-#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
>++#define jp_Addr1   j_po.jpo_u.j_po_Addr1
>++//#define jp_Type    j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]
>++#define jp_Type    j_p1.j_p1_Type
>+ #define jp_DcdP0   j_po.jpo_u.j_po_DcdP0
>+ 
>+

Flags:

koobs: maintainer-approval-

Actions: View | Diff

Attachments on bug 257429: 226707