From nobody Fri May 13 04:56:49 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 114421AD37D9; Fri, 13 May 2022 04:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KzxFY6srhz4Zdl; Fri, 13 May 2022 04:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652417810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQME+o0rG+GMs9vANRd0l4ifI7jHedhTnnwy1mxPQ2M=; b=DzFXv6Tz8zgio0t5gMxanWu4Zk7mryt78eDtMMDZpMQ/YE7AORhnx3YnIWSTDXhQ9zbkth 5NaS+BCyPpHcaIwkCHcyn/tAAChGNrsw2k4ztpABZgIRTE9S36HYMfYheVhGdP1OdLYfFA Pl8DFCuLTO4AXzpU4pCS5zJkxvHVY+T9q2nmgwyWXiL5hI0B9qG1reTsAdY+uJ26MoP4rC 7DWodWxs4KHTWDWHCQTwCikogaNBjRbEN1/NSnOziKNRVg3uX0g2IHKmqnGcGIjgucOSv3 yD7WBYoWMhj6pbiPApibodvpL8N6aFt3LG+kgkwOfZQcEXOBCf354QJ3wAGmkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CC4581C5C0; Fri, 13 May 2022 04:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24D4un32009378; Fri, 13 May 2022 04:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24D4ungb009377; Fri, 13 May 2022 04:56:49 GMT (envelope-from git) Date: Fri, 13 May 2022 04:56:49 GMT Message-Id: <202205130456.24D4ungb009377@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Xin LI Subject: git: 39cd1b9f436a - 2022Q2 - databases/lmdb: Fix static library installation. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 39cd1b9f436a6c6d1f9476b42c97e51f94254641 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652417810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qQME+o0rG+GMs9vANRd0l4ifI7jHedhTnnwy1mxPQ2M=; b=A54p+5Mgr4Jf8PbWsyPAS5fmybiHnJ7IAVB+LZkhuW0V8ScfpDxqatn6qQxnIOnY96UTPS QPrbvnNtG5mWGrl7hs231Wh9XiZnzAVHZtDi6FulaboTwbyh0uAg0SdMzFFba7nvN8ry5E fpYbXFtjy2VI85qsRhdIEx1o2eAil7L6h7QAfq2XkJhSy14VtXpQ3RN5W/HU42Zp3jmO6H Dk5ze87eV8SaU4P5wT4BxnVGQdAjE1zToP6PznlKt7HcGvvIcmCLTQH8Fq0k3LU1ig1kos Tpadvdry3cuefT2uBkr8FiY5MhxcQ0XaNhygdyCMUi3ov4qZc5WofmQuZtdXNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652417810; a=rsa-sha256; cv=none; b=uFRFFQlRK2JN/tHohGY0hGtAeG9uMvVWoykHX8wSs+KFMKQxBOU4TY+HdRN8c5FTWReZto Qay3EvmfN52De5Ny+DFNZeU6dgrfmcEDhgtBw/cbsw2lg/9SFiPKxDY51sioWibZu8tqYV btDzsyldYf64ZJl7hPRIyVavOweXDpKMaf7OSs8PoYNtVRX7mdBdzwMQrqUPe+Ygtd+Z+m 8m+YrRRcbYgzGSiPepF6Tb491+Fqzvf4OuX9FZCg8Wiv9Ky7mEEWyqBWTA0lgd/+3mb//2 XTD2HOY27kpVLgk8iMMNfuA1AST0GLS3mkuOOMrYiPJVLknDqKyTgSZxhftCkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by delphij: URL: https://cgit.FreeBSD.org/ports/commit/?id=39cd1b9f436a6c6d1f9476b42c97e51f94254641 commit 39cd1b9f436a6c6d1f9476b42c97e51f94254641 Author: Xin LI AuthorDate: 2022-05-13 04:54:40 +0000 Commit: Xin LI CommitDate: 2022-05-13 04:56:44 +0000 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 (cherry picked from commit 70f2348dba64651646fd99f5f87c751a6837f499) --- databases/lmdb/Makefile | 1 + 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