diff options
author | Xin LI <delphij@FreeBSD.org> | 2022-05-13 04:54:40 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2022-05-13 04:54:40 +0000 |
commit | 70f2348dba64651646fd99f5f87c751a6837f499 (patch) | |
tree | 9cebef0a766d71996ac79bc9dcff54159a7491e5 /databases/lmdb | |
parent | f9a425bd7bad293c8db3c59e7b09ca34bb5489bd (diff) | |
download | ports-70f2348dba64651646fd99f5f87c751a6837f499.tar.gz ports-70f2348dba64651646fd99f5f87c751a6837f499.zip |
databases/lmdb: Fix static library installation.
INSTALL_LIB will strip symbols, and should not be used for static
libraries.
PR: ports/263884
Reported by: yuri
MFH: 2022Q2
Diffstat (limited to 'databases/lmdb')
-rw-r--r-- | databases/lmdb/Makefile | 1 | ||||
-rw-r--r-- | databases/lmdb/files/patch-Makefile | 27 |
2 files changed, 17 insertions, 11 deletions
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile index 325721a9f62e..1b50dd00d951 100644 --- a/databases/lmdb/Makefile +++ b/databases/lmdb/Makefile @@ -2,6 +2,7 @@ PORTNAME= lmdb PORTVERSION= 0.9.29 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME:tu}_ PORTEPOCH= 1 CATEGORIES= databases diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile index 40fd5d1cd596..b7600527676e 100644 --- a/databases/lmdb/files/patch-Makefile +++ b/databases/lmdb/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2016-12-28 18:36:01 UTC +--- Makefile.orig 2021-03-16 16:41:19 UTC +++ Makefile -@@ -23,17 +23,17 @@ AR = ar +@@ -23,22 +23,24 @@ OPT = -O2 -g W = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized THREADS = -pthread OPT = -O2 -g @@ -22,7 +22,15 @@ ######################################################################## -@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) + IHDRS = lmdb.h +-ILIBS = liblmdb.a liblmdb$(SOEXT) ++LIBS = liblmdb.a ++SHLIBS = liblmdb$(SOEXT) ++ILIBS = $(LIBS) $(SHLIBS) + 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 +@@ -49,10 +51,11 @@ install: $(ILIBS) $(IPROGS) $(IHDRS) mkdir -p $(DESTDIR)$(libdir) mkdir -p $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(mandir)/man1 @@ -31,21 +39,18 @@ - 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 $(LIBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir); done ++ for f in $(SHLIBS); 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] *.[ls]o *~ testdb -@@ -64,20 +64,30 @@ test: all - liblmdb.a: mdb.o midl.o - $(AR) rs $@ mdb.o midl.o +@@ -66,18 +69,28 @@ liblmdb$(SOEXT): mdb.lo midl.lo --liblmdb$(SOEXT): mdb.lo midl.lo --# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) + liblmdb$(SOEXT): 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) -+ liblmdb$(SOEXT): mdb.lo midl.lo -+ # $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) + $(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS) mdb_stat: mdb_stat.o liblmdb.a |