From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 17:47:52 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD26C5D85E5; Mon, 12 Apr 2021 17:47:52 +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 4FJx605VP1z4j4H; Mon, 12 Apr 2021 17:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AF94C1BC84; Mon, 12 Apr 2021 17:47:52 +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 13CHlq4e063945; Mon, 12 Apr 2021 17:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CHlqmk063944; Mon, 12 Apr 2021 17:47:52 GMT (envelope-from git) Date: Mon, 12 Apr 2021 17:47:52 GMT Message-Id: <202104121747.13CHlqmk063944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: fc2fe6e33a4b - main - biology/ngs-sdk: Restore static libs installed with symlinks as shared libs are usually installed MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc2fe6e33a4b7403d4e02aef65440631b4cc55b8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 17:47:52 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc2fe6e33a4b7403d4e02aef65440631b4cc55b8 commit fc2fe6e33a4b7403d4e02aef65440631b4cc55b8 Author: Yuri Victorovich AuthorDate: 2021-04-12 17:45:17 +0000 Commit: Yuri Victorovich 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