View | Details | Raw Unified | Return to bug 218334
Collapse All | Expand All

(-)Makefile (-2 / +8 lines)
Lines 2-10 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	lmdb
4
PORTNAME=	lmdb
5
PORTVERSION=	0.9.18
5
PORTVERSION=	0.9.19
6
DISTVERSIONPREFIX=	${PORTNAME:tu}_
6
PORTEPOCH=	1
7
PORTEPOCH=	1
7
DISTVERSIONPREFIX=	${PORTNAME:tu}_
8
CATEGORIES=	databases
8
CATEGORIES=	databases
9
9
10
MAINTAINER=	delphij@FreeBSD.org
10
MAINTAINER=	delphij@FreeBSD.org
Lines 27-33 Link Here
27
USE_GITHUB=	yes
27
USE_GITHUB=	yes
28
GH_ACCOUNT=	${PORTNAME:tu}
28
GH_ACCOUNT=	${PORTNAME:tu}
29
29
30
TEST_TARGET=	do-test
31
30
post-install:
32
post-install:
31
	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
33
	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
32
34
35
do-test:
36
	${MKDIR} ${WRKSRC}/testdb
37
	cd ${WRKSRC} && ./mtest*
38
33
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1484761556
1
TIMESTAMP = 1491234356
2
SHA256 (LMDB-lmdb-LMDB_0.9.18_GH0.tar.gz) = dd35b471d6eea84f48f2feece13d121abf59ef255308b8624a36223ffbdf9989
2
SHA256 (LMDB-lmdb-LMDB_0.9.19_GH0.tar.gz) = 108532fb94c6f227558d45be3f3347b52539f0f58290a7bb31ec06c462d05326
3
SIZE (LMDB-lmdb-LMDB_0.9.18_GH0.tar.gz) = 139156
3
SIZE (LMDB-lmdb-LMDB_0.9.19_GH0.tar.gz) = 143141
(-)files/patch-Makefile (-19 / +26 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2016-02-05 21:22:15 UTC
1
--- Makefile.orig	2016-12-28 18:36:01 UTC
2
+++ Makefile
2
+++ Makefile
3
@@ -23,7 +23,7 @@ AR	= ar
3
@@ -23,17 +23,17 @@ AR	= ar
4
 W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
4
 W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
5
 THREADS = -pthread
5
 THREADS = -pthread
6
 OPT = -O2 -g
6
 OPT = -O2 -g
Lines 8-15 Link Here
8
+CFLAGS	+= $(THREADS) $(W)
8
+CFLAGS	+= $(THREADS) $(W)
9
 LDLIBS	=
9
 LDLIBS	=
10
 SOLIBS	=
10
 SOLIBS	=
11
 prefix	= /usr/local
11
-SOEXT	= .so
12
@@ -32,26 +32,26 @@ bindir = $(exec_prefix)/bin
12
-prefix	= /usr/local
13
+SOEXT	= .so.0
14
+prefix	?= /usr/local
15
 exec_prefix = $(prefix)
16
 bindir = $(exec_prefix)/bin
13
 libdir = $(exec_prefix)/lib
17
 libdir = $(exec_prefix)/lib
14
 includedir = $(prefix)/include
18
 includedir = $(prefix)/include
15
 datarootdir = $(prefix)/share
19
 datarootdir = $(prefix)/share
Lines 18-34 Link Here
18
 
22
 
19
 ########################################################################
23
 ########################################################################
20
 
24
 
21
 IHDRS	= lmdb.h
25
@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
22
-ILIBS	= liblmdb.a liblmdb.so
23
+ILIBS	= liblmdb.a liblmdb.so.0
24
 IPROGS	= mdb_stat mdb_copy mdb_dump mdb_load
25
 IDOCS	= mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
26
 PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
27
-all:	$(ILIBS) $(PROGS)
28
+all:	$(ILIBS) $(IPROGS)
29
 
30
 install: $(ILIBS) $(IPROGS) $(IHDRS)
31
 	mkdir -p $(DESTDIR)$(bindir)
32
 	mkdir -p $(DESTDIR)$(libdir)
26
 	mkdir -p $(DESTDIR)$(libdir)
33
 	mkdir -p $(DESTDIR)$(includedir)
27
 	mkdir -p $(DESTDIR)$(includedir)
34
 	mkdir -p $(DESTDIR)$(mandir)/man1
28
 	mkdir -p $(DESTDIR)$(mandir)/man1
Lines 43-56 Link Here
43
 
37
 
44
 clean:
38
 clean:
45
 	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
39
 	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
46
@@ -63,14 +63,18 @@ test:	all
40
@@ -64,20 +64,30 @@ test:	all
47
 liblmdb.a:	mdb.o midl.o
41
 liblmdb.a:	mdb.o midl.o
48
 	$(AR) rs $@ mdb.o midl.o
42
 	$(AR) rs $@ mdb.o midl.o
49
 
43
 
50
-liblmdb.so:	mdb.lo midl.lo
44
-liblmdb$(SOEXT):	mdb.lo midl.lo
51
+liblmdb.so.0:	mdb.lo midl.lo
45
-#	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
52
 #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
53
-	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
46
-	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
47
+    liblmdb$(SOEXT):	mdb.lo midl.lo
48
+    #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
54
+	$(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS)
49
+	$(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS)
55
 
50
 
56
 mdb_stat: mdb_stat.o liblmdb.a
51
 mdb_stat: mdb_stat.o liblmdb.a
Lines 62-66 Link Here
62
 mdb_load: mdb_load.o liblmdb.a
57
 mdb_load: mdb_load.o liblmdb.a
63
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
58
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
64
 mtest:    mtest.o    liblmdb.a
59
 mtest:    mtest.o    liblmdb.a
60
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
65
 mtest2:	mtest2.o liblmdb.a
61
 mtest2:	mtest2.o liblmdb.a
62
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
66
 mtest3:	mtest3.o liblmdb.a
63
 mtest3:	mtest3.o liblmdb.a
64
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
65
 mtest4:	mtest4.o liblmdb.a
66
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
67
 mtest5:	mtest5.o liblmdb.a
68
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
69
 mtest6:	mtest6.o liblmdb.a
70
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
71
 
72
 mdb.o: mdb.c lmdb.h midl.h
73
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c

Return to bug 218334