packages/Judy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 remove unwanted files

Browse Source 
Merge pull request !2 from sigui/sgs-own
This commit is contained in:
openeuler-ci-bot 2020-01-10 16:27:06 +08:00 committed by Gitee
commit 66e33c82ff
4 changed files with 8 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Judy-1.0.4-fix-Judy1-mans.patch
View File

@ -1,80 +0,0 @@
diff -up Judy-1.0.4/doc/Makefile.am.fix-Judy1-mans Judy-1.0.4/doc/Makefile.am
--- Judy-1.0.4/doc/Makefile.am.fix-Judy1-mans 2006-01-18 16:56:43.000000000 -0500
+++ Judy-1.0.4/doc/Makefile.am 2008-11-27 14:08:53.000000000 -0500
@@ -100,21 +100,21 @@ man/man3/Judy:
man/man3/Judy1:
../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1
- cd man/man3; ln -s Judy J1T
- cd man/man3; ln -s Judy J1S
- cd man/man3; ln -s Judy J1U
- cd man/man3; ln -s Judy J1F
- cd man/man3; ln -s Judy J1N
- cd man/man3; ln -s Judy J1L
- cd man/man3; ln -s Judy J1P
- cd man/man3; ln -s Judy J1FE
- cd man/man3; ln -s Judy J1NE
- cd man/man3; ln -s Judy J1LE
- cd man/man3; ln -s Judy J1PE
- cd man/man3; ln -s Judy J1C
- cd man/man3; ln -s Judy J1BC
- cd man/man3; ln -s Judy J1FA
- cd man/man3; ln -s Judy J1MU
+ cd man/man3; ln -s Judy1 J1T
+ cd man/man3; ln -s Judy1 J1S
+ cd man/man3; ln -s Judy1 J1U
+ cd man/man3; ln -s Judy1 J1F
+ cd man/man3; ln -s Judy1 J1N
+ cd man/man3; ln -s Judy1 J1L
+ cd man/man3; ln -s Judy1 J1P
+ cd man/man3; ln -s Judy1 J1FE
+ cd man/man3; ln -s Judy1 J1NE
+ cd man/man3; ln -s Judy1 J1LE
+ cd man/man3; ln -s Judy1 J1PE
+ cd man/man3; ln -s Judy1 J1C
+ cd man/man3; ln -s Judy1 J1BC
+ cd man/man3; ln -s Judy1 J1FA
+ cd man/man3; ln -s Judy1 J1MU
man/man3/Judy1_funcs:
../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs
diff -up Judy-1.0.4/doc/Makefile.in.fix-Judy1-mans Judy-1.0.4/doc/Makefile.in
--- Judy-1.0.4/doc/Makefile.in.fix-Judy1-mans 2007-05-14 17:10:55.000000000 -0400
+++ Judy-1.0.4/doc/Makefile.in 2008-12-13 12:55:14.000000000 -0500
@@ -471,21 +479,21 @@ man/man3/Judy:
man/man3/Judy1:
../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1
- cd man/man3; ln -s Judy J1T
- cd man/man3; ln -s Judy J1S
- cd man/man3; ln -s Judy J1U
- cd man/man3; ln -s Judy J1F
- cd man/man3; ln -s Judy J1N
- cd man/man3; ln -s Judy J1L
- cd man/man3; ln -s Judy J1P
- cd man/man3; ln -s Judy J1FE
- cd man/man3; ln -s Judy J1NE
- cd man/man3; ln -s Judy J1LE
- cd man/man3; ln -s Judy J1PE
- cd man/man3; ln -s Judy J1C
- cd man/man3; ln -s Judy J1BC
- cd man/man3; ln -s Judy J1FA
- cd man/man3; ln -s Judy J1MU
+ cd man/man3; ln -s Judy1 J1T
+ cd man/man3; ln -s Judy1 J1S
+ cd man/man3; ln -s Judy1 J1U
+ cd man/man3; ln -s Judy1 J1F
+ cd man/man3; ln -s Judy1 J1N
+ cd man/man3; ln -s Judy1 J1L
+ cd man/man3; ln -s Judy1 J1P
+ cd man/man3; ln -s Judy1 J1FE
+ cd man/man3; ln -s Judy1 J1NE
+ cd man/man3; ln -s Judy1 J1LE
+ cd man/man3; ln -s Judy1 J1PE
+ cd man/man3; ln -s Judy1 J1C
+ cd man/man3; ln -s Judy1 J1BC
+ cd man/man3; ln -s Judy1 J1FA
+ cd man/man3; ln -s Judy1 J1MU
man/man3/Judy1_funcs:
../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs

14
Judy-1.0.4-test-shared.patch
View File

@ -1,14 +0,0 @@
diff -up Judy-1.0.4/test/Checkit.test-shared Judy-1.0.4/test/Checkit
--- Judy-1.0.4/test/Checkit.test-shared 2007-05-14 13:02:16.000000000 -0400
+++ Judy-1.0.4/test/Checkit 2008-11-27 12:56:28.000000000 -0500
@@ -4,8 +4,9 @@ CC=${CC:-cc}
echo
echo "=== +++++++++ This test runs in 15 seconds on a PIII 750Mhz +++++++"
-LIBJUDY=`find ../ -name libJudy.a`
+LIBJUDY=`find ../ -name libJudy.so`
JUDY_H=`find ../ -name Judy.h`
+export LD_LIBRARY_PATH=`dirname $LIBJUDY`
echo "$CC -O SLcompare.c -DHASHMETHOD -o SL_Hash"
$CC -O SLcompare.c -DHASHMETHOD -o SL_Hash

120
Judy-1.0.5-undefined-behavior.patch
View File

@ -1,120 +0,0 @@
diff -crb judy-1.0.5-orig/src/JudyCommon/JudyByCount.c judy-1.0.5/src/JudyCommon/JudyByCount.c
*** judy-1.0.5-orig/src/JudyCommon/JudyByCount.c 2005-02-15 15:06:07.000000000 -0600
--- judy-1.0.5/src/JudyCommon/JudyByCount.c 2014-02-18 13:45:35.225145230 -0600
***************
*** 817,823 ****
// Shorthand for where to find start of Index bytes array:
#ifdef JUDY1
! #define PJI (Pjp->jp_1Index)
#else
#define PJI (Pjp->jp_LIndex)
#endif
--- 817,823 ----
// Shorthand for where to find start of Index bytes array:
#ifdef JUDY1
! #define PJI (Pjp->jp_2Index)
#else
#define PJI (Pjp->jp_LIndex)
#endif
diff -crb judy-1.0.5-orig/src/JudyCommon/JudyGet.c judy-1.0.5/src/JudyCommon/JudyGet.c
*** judy-1.0.5-orig/src/JudyCommon/JudyGet.c 2005-02-15 15:06:07.000000000 -0600
--- judy-1.0.5/src/JudyCommon/JudyGet.c 2014-02-18 13:49:50.840632644 -0600
***************
*** 630,636 ****
#ifdef JUDY1
#define CHECKINDEXNATIVE(LEAF_T, PJP, IDX, INDEX) \
! if (((LEAF_T *)((PJP)->jp_1Index))[(IDX) - 1] == (LEAF_T)(INDEX)) \
return(1)
#define CHECKLEAFNONNAT(LFBTS, PJP, INDEX, IDX, COPY) \
--- 630,636 ----
#ifdef JUDY1
#define CHECKINDEXNATIVE(LEAF_T, PJP, IDX, INDEX) \
! if (((LEAF_T *)((PJP)->jp_2Index))[(IDX) - 1] == (LEAF_T)(INDEX)) \
return(1)
#define CHECKLEAFNONNAT(LFBTS, PJP, INDEX, IDX, COPY) \
diff -crb judy-1.0.5-orig/src/JudyCommon/JudyIns.c judy-1.0.5/src/JudyCommon/JudyIns.c
*** judy-1.0.5-orig/src/JudyCommon/JudyIns.c 2005-02-15 15:06:07.000000000 -0600
--- judy-1.0.5/src/JudyCommon/JudyIns.c 2014-02-18 13:00:49.871850635 -0600
***************
*** 1503,1509 ****
JU_BITMAPSETL(Pjlb, Index);
for (offset = 0; offset < 15; ++offset)
! JU_BITMAPSETL(Pjlb, Pjp->jp_1Index[offset]);
// Set jp_DcdPopO including the current pop0; incremented later:
DcdP0 = (Index & cJU_DCDMASK(1)) + 15 - 1;
--- 1503,1510 ----
JU_BITMAPSETL(Pjlb, Index);
for (offset = 0; offset < 15; ++offset)
! // JU_BITMAPSETL(Pjlb, Pjp->jp_1Index[offset]); // elements 8..15 are optimized out by gcc, so need to do the following
! JU_BITMAPSETL(Pjlb, Pjp->jp_2Index[offset]);
// Set jp_DcdPopO including the current pop0; incremented later:
DcdP0 = (Index & cJU_DCDMASK(1)) + 15 - 1;
diff -crb judy-1.0.5-orig/src/JudyCommon/JudyPrevNext.c judy-1.0.5/src/JudyCommon/JudyPrevNext.c
*** judy-1.0.5-orig/src/JudyCommon/JudyPrevNext.c 2005-02-15 15:06:07.000000000 -0600
--- judy-1.0.5/src/JudyCommon/JudyPrevNext.c 2014-02-18 13:45:40.972875737 -0600
***************
*** 907,913 ****
// Shorthand for where to find start of Index bytes array:
#ifdef JUDY1
! #define PJI (Pjp->jp_1Index)
#else
#define PJI (Pjp->jp_LIndex)
#endif
--- 907,913 ----
// Shorthand for where to find start of Index bytes array:
#ifdef JUDY1
! #define PJI (Pjp->jp_2Index)
#else
#define PJI (Pjp->jp_LIndex)
#endif
diff -crb judy-1.0.5-orig/src/JudyCommon/JudyPrivateBranch.h judy-1.0.5/src/JudyCommon/JudyPrivateBranch.h
*** judy-1.0.5-orig/src/JudyCommon/JudyPrivateBranch.h 2005-02-15 15:06:07.000000000 -0600
--- judy-1.0.5/src/JudyCommon/JudyPrivateBranch.h 2014-02-18 13:00:39.510533765 -0600
***************
*** 86,91 ****
--- 86,98 ----
} jpi_t;
+ typedef struct _JUDY_POINTER_IMMED2 // JPI2.
+ {
+ uint8_t j_pi_2Index[2 * sizeof(Word_t) - 1]; // see above.
+ uint8_t j_pi_Type; // JP type, 1 of cJ*_JPIMMED*.
+ } jpi2_t;
+
+
// UNION OF JP TYPES:
//
// A branch is an array of cJU_BRANCHUNUMJPS (256) of this object, or an
***************
*** 97,102 ****
--- 104,110 ----
{
jpo_t j_po; // other than immediate indexes.
jpi_t j_pi; // immediate indexes.
+ jpi2_t j_pi2; // immediate indexes using j_pi_LIndex as well
} jp_t, *Pjp_t;
// For coding convenience:
***************
*** 105,110 ****
--- 113,119 ----
#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_2Index j_pi2.j_pi_2Index // for storing Indexes spanning both words.
#define jp_Addr j_po.j_po_Addr
//#define jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0
#define jp_Type j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1]

19
Judy.spec
View File

@ -5,11 +5,6 @@ Summary: C library array
License: LGPLv2+
URL: http://sourceforge.net/projects/judy/
Source0: http://downloads.sf.net/judy/Judy-%{version}.tar.gz
Patch0000: Judy-1.0.4-test-shared.patch
Patch0001: Judy-1.0.4-fix-Judy1-mans.patch
Patch0002: Judy-1.0.5-undefined-behavior.patch
BuildRequires: coreutils gawk make sed gcc >= 4.1
%description
@ -23,8 +18,8 @@ Requires: %{name} = %{version}-%{release}
%description devel
This package contains header files and development libraries.
%package help
Summary: API documentation for Judy.
%package help
Summary: API documentation for Judy.
%description help
The help for Judy to use.
@ -42,7 +37,6 @@ make
%make_install
rm -f %{buildroot}%{_libdir}/*.a
%delete_la
rm -rf doc/man doc/Makefile* doc/ext/{README_deliver,COPYRIGHT,LICENSE}
%check
cd test
@ -55,19 +49,22 @@ cd -
%postun
/sbin/ldconfig
%files
%license COPYING
%{_libdir}/libJudy.so.*
%files devel
%doc doc
%{_includedir}/Judy.h
%{_libdir}/libJudy.so
%files help
%{_mandir}/man3/J*.3*
%doc README examples
%doc README examples AUTHORS ChangeLog
%changelog
* Wed Jan 8 2020 sunguoshuai <sunguoshuai@huawei.com> - 1.0.5-19
- Delete unwanted files.
* Thu Nov 14 2019 wangye<wangye54@huawei.com> - 1.0.5-19
- Package init
- Package init.