Date: Tue, 9 Aug 2016 21:28:45 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419973 - in head/databases/lmdb: . files Message-ID: <201608092128.u79LSjT3011223@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Aug 9 21:28:45 2016 New Revision: 419973 URL: https://svnweb.freebsd.org/changeset/ports/419973 Log: Add soname and cleanup Using soname allows pkg(8) to register the library, and it helps on upgrades. Use WRKSRC_SUBDIR Use MAKE_ARGS instead of MAKE_ENV so the patch can be simplified. PR: 211700 Submitted by: mat Approved by: delphij (maintainer) Sponsored by: Absolight Modified: head/databases/lmdb/Makefile (contents, props changed) head/databases/lmdb/files/patch-Makefile (contents, props changed) Modified: head/databases/lmdb/Makefile ============================================================================== --- head/databases/lmdb/Makefile Tue Aug 9 21:20:09 2016 (r419972) +++ head/databases/lmdb/Makefile Tue Aug 9 21:28:45 2016 (r419973) @@ -3,6 +3,7 @@ PORTNAME= lmdb PORTVERSION= 0.9.18 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME:tu}_ CATEGORIES= databases @@ -16,10 +17,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time. CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME:tu}_${PORTVERSION}/libraries/liblmdb -MAKE_ENV+= CC="${CC}" -MAKE_ENV+= prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" -MAKE_ENV+= INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" +WRKSRC_SUBDIR= libraries/liblmdb +MAKE_ARGS+= CC="${CC}" +MAKE_ARGS+= prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" +MAKE_ARGS+= INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}" USE_LDCONFIG= yes Modified: head/databases/lmdb/files/patch-Makefile ============================================================================== --- head/databases/lmdb/files/patch-Makefile Tue Aug 9 21:20:09 2016 (r419972) +++ head/databases/lmdb/files/patch-Makefile Tue Aug 9 21:28:45 2016 (r419973) @@ -1,12 +1,6 @@ --- Makefile.orig 2016-02-05 21:22:15 UTC +++ Makefile -@@ -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 +@@ -23,7 +23,7 @@ AR = ar W = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized THREADS = -pthread OPT = -O2 -g @@ -14,10 +8,8 @@ +CFLAGS += $(THREADS) $(W) LDLIBS = SOLIBS = --prefix = /usr/local -+prefix ?= /usr/local - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin + prefix = /usr/local +@@ -32,26 +32,26 @@ bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib includedir = $(prefix)/include datarootdir = $(prefix)/share @@ -58,7 +50,8 @@ -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) +- $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) ++ $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) mdb_stat: mdb_stat.o liblmdb.a + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608092128.u79LSjT3011223>