Attachment 169278 Details for Bug 208766 – Update lmdb to 0.9.18

Update lmdb to 0.9.18

lmdb-0.9.18.diff.txt (text/plain), 5.01 KB, created by Pietro Cerutti on 2016-04-13 08:35:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2016-04-13 08:35:07 UTC

Size: 5.01 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 413175)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	lmdb
>-PORTVERSION=	0.9.16
>+PORTVERSION=	0.9.18
> DISTVERSIONPREFIX=	${PORTNAME:tu}_
> CATEGORIES=	databases
> 
>@@ -18,7 +18,7 @@
> CFLAGS+=	-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME:tu}_${PORTVERSION}/libraries/liblmdb
> MAKE_ENV+=	CC="${CC}"
>-MAKE_ENV+=	XCFLAGS="${CFLAGS} -pthread" prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
>+MAKE_ENV+=	prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
> MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
> 
> USE_LDCONFIG=	yes
>@@ -26,18 +26,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	${PORTNAME:tu}
> 
>-MDB_APPS=	copy dump load stat
>-
>-do-install:
>-	${INSTALL_DATA} ${WRKSRC}/liblmdb.a ${STAGEDIR}${PREFIX}/lib/
>-	${INSTALL_LIB} ${WRKSRC}/liblmdb.so ${STAGEDIR}${PREFIX}/lib/liblmdb.so.0
>+post-install:
> 	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
>-.for f in ${MDB_APPS}
>-	${INSTALL_PROGRAM} ${WRKSRC}/mdb_${f} ${STAGEDIR}${PREFIX}/bin
>-.endfor
>-	${INSTALL_DATA} ${WRKSRC}/lmdb.h ${STAGEDIR}${PREFIX}/include
>-.for f in ${MDB_APPS}
>-	${INSTALL_MAN} ${WRKSRC}/mdb_${f}.1 ${STAGEDIR}${PREFIX}/man/man1
>-.endfor
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 413175)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (LMDB-lmdb-LMDB_0.9.16_GH0.tar.gz) = 49d7b40949f2ced9bc8b23ea6a89e75471a1c9126537a8b268c318a00b84322b
>-SIZE (LMDB-lmdb-LMDB_0.9.16_GH0.tar.gz) = 130343
>+SHA256 (LMDB-lmdb-LMDB_0.9.18_GH0.tar.gz) = dd35b471d6eea84f48f2feece13d121abf59ef255308b8624a36223ffbdf9989
>+SIZE (LMDB-lmdb-LMDB_0.9.18_GH0.tar.gz) = 139156
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 413175)
>+++ files/patch-Makefile	(working copy)
>@@ -1,22 +1,34 @@
>---- Makefile.orig	2014-09-20 06:24:32 UTC
>+--- Makefile.orig	2016-02-05 21:22:15 UTC
> +++ Makefile
>-@@ -16,14 +16,12 @@
>+@@ -18,40 +18,40 @@
>  # There may be other macros in mdb.c of interest. You should
>  # read mdb.c before changing any of them.
>  #
> -CC	= gcc
>++CC	?= gcc
>+ AR	= ar
>  W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
>  THREADS = -pthread
>  OPT = -O2 -g
> -CFLAGS	= $(THREADS) $(OPT) $(W) $(XCFLAGS)
>-+CFLAGS	= $(XCFLAGS)
>++CFLAGS	+= $(THREADS) $(W)
>  LDLIBS	=
>  SOLIBS	=
> -prefix	= /usr/local
>++prefix	?= /usr/local
>+ exec_prefix = $(prefix)
>+ bindir = $(exec_prefix)/bin
>+ libdir = $(exec_prefix)/lib
>+ includedir = $(prefix)/include
>+ datarootdir = $(prefix)/share
>+-mandir = $(datarootdir)/man
>++mandir = $(prefix)/man
>  
>  ########################################################################
>  
>-@@ -32,13 +30,13 @@ ILIBS	= liblmdb.a liblmdb.so
>+ IHDRS	= lmdb.h
>+-ILIBS	= liblmdb.a liblmdb.so
>++ILIBS	= liblmdb.a liblmdb.so.0
>  IPROGS	= mdb_stat mdb_copy mdb_dump mdb_load
>  IDOCS	= mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
>  PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
>@@ -24,20 +36,30 @@
> +all:	$(ILIBS) $(IPROGS)
>  
>  install: $(ILIBS) $(IPROGS) $(IHDRS)
>--	for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done
>--	for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done
>--	for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done
>--	for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done
>-+	for f in $(IPROGS); do ${INSTALL_PROGRAM} $$f $(DESTDIR)$(prefix)/bin; done
>-+	for f in $(ILIBS); do ${INSTALL_LIB} $$f $(DESTDIR)$(prefix)/lib; done
>-+	for f in $(IHDRS); do ${INSTALL_DATA} $$f $(DESTDIR)$(prefix)/include; done
>-+	for f in $(IDOCS); do ${INSTALL_MAN} $$f $(DESTDIR)$(prefix)/man/man1; done
>+ 	mkdir -p $(DESTDIR)$(bindir)
>+ 	mkdir -p $(DESTDIR)$(libdir)
>+ 	mkdir -p $(DESTDIR)$(includedir)
>+ 	mkdir -p $(DESTDIR)$(mandir)/man1
>+-	for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
>+-	for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
>+-	for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
>+-	for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
>++	for f in $(IPROGS); do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir); done
>++	for f in $(ILIBS); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); done
>++	for f in $(IHDRS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir); done
>++	for f in $(IDOCS); do $(INSTALL_MAN) $$f $(DESTDIR)$(mandir)/man1; done
>  
>  clean:
>- 	rm -rf $(PROGS) *.[ao] *.so *~ testdb
>-@@ -55,9 +53,13 @@ liblmdb.so:	mdb.o midl.o
>- 	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.o midl.o $(SOLIBS)
>+ 	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
>+@@ -63,14 +63,18 @@ test:	all
>+ liblmdb.a:	mdb.o midl.o
>+ 	$(AR) rs $@ mdb.o midl.o
>  
>+-liblmdb.so:	mdb.lo midl.lo
>++liblmdb.so.0:	mdb.lo midl.lo
>+ #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
>+ 	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
>+ 
>  mdb_stat: mdb_stat.o liblmdb.a
> +	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
>  mdb_copy: mdb_copy.o liblmdb.a

Actions: View

Attachments on bug 208766: 169278