* [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/
@ 2021-04-19 19:12 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-04-19 19:12 UTC (permalink / raw
To: gentoo-commits
commit: d7e09b50da172482e0ff2f428b9af7f91d758aa2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 16:53:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 19:12:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e09b50
dev-db/cdb: port to EAPI 7
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/cdb/cdb-0.75-r4.ebuild | 20 +++++----
dev-db/cdb/files/cdb-0.75-errno.diff | 4 +-
dev-db/cdb/files/cdb-0.75-stdint.diff | 85 ++++++++++++++---------------------
3 files changed, 48 insertions(+), 61 deletions(-)
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 70faa97030d..a2dd2c71b29 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit epatch multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
@@ -16,18 +16,22 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~am
DEPEND="!dev-db/tinycdb"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-errno.diff
+ "${FILESDIR}"/${P}-stdint.diff
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${P}-errno.diff
- epatch "${FILESDIR}"/${P}-stdint.diff
+ default
sed -i -e 's/head -1/head -n 1/g' Makefile \
|| die "sed Makefile failed"
}
src_configure() {
- echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
- echo "${EPREFIX}/usr" > conf-home
+ echo "$(tc-getCC) ${CFLAGS} -fPIC" > conf-cc || die
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+ echo "${EPREFIX}/usr" > conf-home || die
}
src_install() {
@@ -35,7 +39,7 @@ src_install() {
# ok so ... first off, some automakes fail at finding
# cdb.a, so install that now
- dolib *.a
+ dolib.a *.a
# then do this pretty little symlinking to solve the somewhat
# cosmetic library issue at hand
diff --git a/dev-db/cdb/files/cdb-0.75-errno.diff b/dev-db/cdb/files/cdb-0.75-errno.diff
index 5f6ac20c59c..e037ded7aac 100644
--- a/dev-db/cdb/files/cdb-0.75-errno.diff
+++ b/dev-db/cdb/files/cdb-0.75-errno.diff
@@ -1,5 +1,5 @@
---- error.h.orig 2003-03-29 04:18:26.000000000 -0800
-+++ error.h 2003-03-29 04:19:00.000000000 -0800
+--- a/error.h
++++ b/error.h
@@ -1,7 +1,7 @@
#ifndef ERROR_H
#define ERROR_H
diff --git a/dev-db/cdb/files/cdb-0.75-stdint.diff b/dev-db/cdb/files/cdb-0.75-stdint.diff
index eb564512075..1775fd84f90 100644
--- a/dev-db/cdb/files/cdb-0.75-stdint.diff
+++ b/dev-db/cdb/files/cdb-0.75-stdint.diff
@@ -1,6 +1,5 @@
-diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
---- cdb-0.75-orig/cdb.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.c
++++ b/cdb.c
@@ -41,7 +41,7 @@
}
}
@@ -30,9 +29,8 @@ diff -Naur cdb-0.75-orig/cdb.c cdb-0.75/cdb.c
if (!c->loop) {
u = cdb_hash(key,len);
-diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
---- cdb-0.75-orig/cdbdump.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbdump.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbdump.c
++++ b/cdbdump.c
@@ -18,7 +18,7 @@
if (buffer_flush(buffer_1) == -1) die_write();
}
@@ -73,9 +71,8 @@ diff -Naur cdb-0.75-orig/cdbdump.c cdb-0.75/cdbdump.c
getnum(&eod);
while (pos < 2048) getnum(&dlen);
-diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
---- cdb-0.75-orig/cdbget.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbget.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbget.c
++++ b/cdbget.c
@@ -27,8 +27,8 @@
{
char *key;
@@ -87,9 +84,8 @@ diff -Naur cdb-0.75-orig/cdbget.c cdb-0.75/cdbget.c
unsigned long u = 0;
if (!*argv) die_usage();
-diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
---- cdb-0.75-orig/cdb.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb.h
++++ b/cdb.h
@@ -6,26 +6,26 @@
#include "uint32.h"
@@ -128,9 +124,8 @@ diff -Naur cdb-0.75-orig/cdb.h cdb-0.75/cdb.h
extern void cdb_findstart(struct cdb *);
extern int cdb_findnext(struct cdb *,char *,unsigned int);
-diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
---- cdb-0.75-orig/cdb_hash.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_hash.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_hash.c
++++ b/cdb_hash.c
@@ -2,15 +2,15 @@
#include "cdb.h"
@@ -150,9 +145,8 @@ diff -Naur cdb-0.75-orig/cdb_hash.c cdb-0.75/cdb_hash.c
h = CDB_HASHSTART;
while (len) {
-diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
---- cdb-0.75-orig/cdb_make.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.c 2009-01-16 19:51:05.000000000 +0100
+--- a/cdb_make.c
++++ b/cdb_make.c
@@ -19,15 +19,15 @@
return seek_set(fd,c->pos);
}
@@ -198,9 +192,8 @@ diff -Naur cdb-0.75-orig/cdb_make.c cdb-0.75/cdb_make.c
u /= sizeof(struct cdb_hp);
if (memsize > u) { errno = error_nomem; return -1; }
-diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
---- cdb-0.75-orig/cdbmake.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbmake.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbmake.c
++++ b/cdbmake.c
@@ -41,7 +41,7 @@
unsigned int klen;
unsigned int dlen;
@@ -210,9 +203,8 @@ diff -Naur cdb-0.75-orig/cdbmake.c cdb-0.75/cdbmake.c
int fd;
char ch;
-diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
---- cdb-0.75-orig/cdb_make.h 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdb_make.h 2009-01-16 19:46:17.000000000 +0100
+--- a/cdb_make.h
++++ b/cdb_make.h
@@ -8,7 +8,7 @@
#define CDB_HPLIST 1000
@@ -248,9 +240,8 @@ diff -Naur cdb-0.75-orig/cdb_make.h cdb-0.75/cdb_make.h
extern int cdb_make_add(struct cdb_make *,char *,unsigned int,char *,unsigned int);
extern int cdb_make_finish(struct cdb_make *);
-diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
---- cdb-0.75-orig/cdbstats.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbstats.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbstats.c
++++ b/cdbstats.c
@@ -28,7 +28,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -282,9 +273,8 @@ diff -Naur cdb-0.75-orig/cdbstats.c cdb-0.75/cdbstats.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
---- cdb-0.75-orig/cdbtest.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/cdbtest.c 2009-01-16 19:46:17.000000000 +0100
+--- a/cdbtest.c
++++ b/cdbtest.c
@@ -24,7 +24,7 @@
if (buffer_flush(buffer_1small) == -1) die_write();
}
@@ -316,9 +306,8 @@ diff -Naur cdb-0.75-orig/cdbtest.c cdb-0.75/cdbtest.c
seek_pos rest;
int r;
-diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
---- cdb-0.75-orig/Makefile 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/Makefile 2009-01-16 19:46:17.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -298,13 +298,6 @@
uint32.h
./compile testzero.c
@@ -333,9 +322,8 @@ diff -Naur cdb-0.75-orig/Makefile cdb-0.75/Makefile
uint32_pack.o: \
compile uint32_pack.c uint32.h
./compile uint32_pack.c
-diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
---- cdb-0.75-orig/TARGETS 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/TARGETS 2009-01-16 19:52:06.000000000 +0100
+--- a/TARGETS
++++ b/TARGETS
@@ -1,6 +1,5 @@
load
compile
@@ -343,9 +331,8 @@ diff -Naur cdb-0.75-orig/TARGETS cdb-0.75/TARGETS
cdbget.o
systype
makelib
-diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
---- cdb-0.75-orig/uint32.h 1970-01-01 01:00:00.000000000 +0100
-+++ cdb-0.75/uint32.h 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32.h
++++ b/uint32.h
@@ -0,0 +1,11 @@
+#ifndef UINT32_H
+#define UINT32_H
@@ -358,9 +345,8 @@ diff -Naur cdb-0.75-orig/uint32.h cdb-0.75/uint32.h
+extern void uint32_unpack_big(char *,uint32_t *);
+
+#endif
-diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
---- cdb-0.75-orig/uint32.h1 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h1 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h1
++++ b/uint32.h1
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -373,9 +359,8 @@ diff -Naur cdb-0.75-orig/uint32.h1 cdb-0.75/uint32.h1
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
---- cdb-0.75-orig/uint32.h2 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32.h2 1970-01-01 01:00:00.000000000 +0100
+--- a/uint32.h2
++++ b/uint32.h2
@@ -1,11 +0,0 @@
-#ifndef UINT32_H
-#define UINT32_H
@@ -388,9 +373,8 @@ diff -Naur cdb-0.75-orig/uint32.h2 cdb-0.75/uint32.h2
-extern void uint32_unpack_big(char *,uint32 *);
-
-#endif
-diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
---- cdb-0.75-orig/uint32_pack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_pack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_pack.c
++++ b/uint32_pack.c
@@ -1,6 +1,6 @@
#include "uint32.h"
@@ -408,9 +392,8 @@ diff -Naur cdb-0.75-orig/uint32_pack.c cdb-0.75/uint32_pack.c
{
s[3] = u & 255;
u >>= 8;
-diff -Naur cdb-0.75-orig/uint32_unpack.c cdb-0.75/uint32_unpack.c
---- cdb-0.75-orig/uint32_unpack.c 2009-01-16 19:38:41.000000000 +0100
-+++ cdb-0.75/uint32_unpack.c 2009-01-16 19:46:17.000000000 +0100
+--- a/uint32_unpack.c
++++ b/uint32_unpack.c
@@ -1,8 +1,8 @@
#include "uint32.h"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/
@ 2021-11-10 13:46 Akinori Hattori
0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2021-11-10 13:46 UTC (permalink / raw
To: gentoo-commits
commit: 58d46a271f1bfbe0965971bae534c805bef0e244
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 13:40:47 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 13:40:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d46a27
dev-db/cdb: fix build
Closes: https://bugs.gentoo.org/693094
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-db/cdb/cdb-0.75-r4.ebuild | 1 +
dev-db/cdb/files/cdb-inline.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index ff5d1a6ffa7..23009ad748e 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -18,6 +18,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-errno.patch
+ "${FILESDIR}"/${PN}-inline.patch
"${FILESDIR}"/${PN}-stdint.patch
)
diff --git a/dev-db/cdb/files/cdb-inline.patch b/dev-db/cdb/files/cdb-inline.patch
new file mode 100644
index 00000000000..2d297dc62a4
--- /dev/null
+++ b/dev-db/cdb/files/cdb-inline.patch
@@ -0,0 +1,11 @@
+--- a/cdbmake.c
++++ b/cdbmake.c
+@@ -26,7 +26,7 @@
+ strerr_die2x(111,FATAL,"unable to read input: bad format");
+ }
+
+-inline void get(char *ch)
++static inline void get(char *ch)
+ {
+ switch(buffer_GETC(buffer_0,ch)) {
+ case 0: die_readformat();
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-10 13:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 19:12 [gentoo-commits] repo/gentoo:master commit in: dev-db/cdb/, dev-db/cdb/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-11-10 13:46 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox