Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Apr 2021 18:05:01 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 353678f54b5f - main - biology/ncbi-vdb: Restore static libs installed with symlinks as shared libs are usually installed
Message-ID:  <202104121805.13CI51eY090395@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=353678f54b5fcc1821077ab3f84fe389a1ef2b9b

commit 353678f54b5fcc1821077ab3f84fe389a1ef2b9b
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-04-12 18:03:14 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-04-12 18:03:14 +0000

    biology/ncbi-vdb: Restore static libs installed with symlinks as shared libs are usually installed
    
    Symlinks like this libxx.a->libxx.a.N.N.N first looked broken but it turned out that this is intentional.
    
    PR:             223273
---
 biology/ncbi-vdb/Makefile  |  6 +++---
 biology/ncbi-vdb/pkg-plist | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/biology/ncbi-vdb/Makefile b/biology/ncbi-vdb/Makefile
index e3ec6af6a55b..99f88f4f7131 100644
--- a/biology/ncbi-vdb/Makefile
+++ b/biology/ncbi-vdb/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ncbi-vdb
 DISTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	biology
 
 MAINTAINER=	mzaki@niid.go.jp
@@ -57,8 +58,7 @@ post-patch:
 post-configure:
 	@${ECHO} ${CHOSEN_COMPILER_TYPE} > ${WRKSRC}/build/COMP
 
-post-install:
-	# remove static libs built instead of shared libs, see https://github.com/ncbi/ncbi-vdb/issues/36
-	cd ${STAGEDIR}${PREFIX}/lib && ${RM} libkdf5.a* libncbi-ngs-c++.a* libncbi-ngs.a* libncbi-vdb.a* libncbi-wvdb.a*
+# The 'install' target installs broken-looking static libs with symlinks.
+# This is intentional, see comments https://github.com/ncbi/ncbi-vdb/issues/36#issuecomment-817990790 This may change in future versions.
 
 .include <bsd.port.mk>
diff --git a/biology/ncbi-vdb/pkg-plist b/biology/ncbi-vdb/pkg-plist
index bd0a6d8f1054..8473b7790ed2 100644
--- a/biology/ncbi-vdb/pkg-plist
+++ b/biology/ncbi-vdb/pkg-plist
@@ -1,15 +1,30 @@
 include/ncbi-vdb/NGS.hpp
 lib/libkdf5-static.a
+lib/libkdf5.a
+lib/libkdf5.a.2
+lib/libkdf5.a.2.11.0
 lib/libkdf5.so
 lib/libkdf5.so.2
 lib/libkdf5.so.2.11.0
 lib/libncbi-ngs-c++-static.a
+lib/libncbi-ngs-c++.a
+lib/libncbi-ngs-c++.a.2
+lib/libncbi-ngs-c++.a.2.11.0
 lib/libncbi-ngs-static.a
+lib/libncbi-ngs.a
+lib/libncbi-ngs.a.2
+lib/libncbi-ngs.a.2.11.0
 lib/libncbi-vdb-static.a
+lib/libncbi-vdb.a
+lib/libncbi-vdb.a.2
+lib/libncbi-vdb.a.2.11.0
 lib/libncbi-vdb.so
 lib/libncbi-vdb.so.2
 lib/libncbi-vdb.so.2.11.0
 lib/libncbi-wvdb-static.a
+lib/libncbi-wvdb.a
+lib/libncbi-wvdb.a.2
+lib/libncbi-wvdb.a.2.11.0
 lib/libncbi-wvdb.so
 lib/libncbi-wvdb.so.2
 lib/libncbi-wvdb.so.2.11.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104121805.13CI51eY090395>