Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Apr 2021 17:47:52 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: fc2fe6e33a4b - main - biology/ngs-sdk: Restore static libs installed with symlinks as shared libs are usually installed
Message-ID:  <202104121747.13CHlqmk063944@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=fc2fe6e33a4b7403d4e02aef65440631b4cc55b8

commit fc2fe6e33a4b7403d4e02aef65440631b4cc55b8
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-04-12 17:45:17 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-04-12 17:47:50 +0000

    biology/ngs-sdk: 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.
---
 biology/ngs-sdk/Makefile  | 6 +++---
 biology/ngs-sdk/pkg-plist | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/biology/ngs-sdk/Makefile b/biology/ngs-sdk/Makefile
index ca7321dc39fc..6382f767caa6 100644
--- a/biology/ngs-sdk/Makefile
+++ b/biology/ngs-sdk/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ngs
 DISTVERSION=	2.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
 PKGNAMESUFFIX=	-sdk
 
@@ -36,8 +36,8 @@ do-install: # install target from the project breaks: https://github.com/ncbi/ng
 	${RM} -r ${STAGEDIR}${PREFIX}/include/ngs/win
 	# install libraries
 	cd ${WRKSRC}/build/ngs-sdk/FreeBSD/clang/amd64/rel/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib
-	# remove static libs built instead of shared libs, see https://github.com/ncbi/ngs/issues/33
-	cd ${STAGEDIR}${PREFIX}/lib && ${RM} libngs-c++.a* libngs-adapt-c++.a*
+		# The above command 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.
 	# strip
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libngs-sdk.so.2.11.0
 
diff --git a/biology/ngs-sdk/pkg-plist b/biology/ngs-sdk/pkg-plist
index 5b9c929a1a46..93a82bd6b5e9 100644
--- a/biology/ngs-sdk/pkg-plist
+++ b/biology/ngs-sdk/pkg-plist
@@ -88,7 +88,13 @@ include/ngs/unix/fat86/atomic32.h
 include/ngs/unix/i386/atomic32.h
 include/ngs/unix/x86_64/atomic32.h
 lib/libngs-adapt-c++-static.a
+lib/libngs-adapt-c++.a
+lib/libngs-adapt-c++.a.2
+lib/libngs-adapt-c++.a.2.11.0
 lib/libngs-c++-static.a
+lib/libngs-c++.a
+lib/libngs-c++.a.2
+lib/libngs-c++.a.2.11.0
 lib/libngs-sdk.so
 lib/libngs-sdk.so.2
 lib/libngs-sdk.so.2.11.0



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