From nobody Wed Sep 06 20:01:39 2023 X-Original-To: dev-commits-ports-all@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 4RgtYb6mQ0z4sSpZ; Wed, 6 Sep 2023 20:01:39 +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 4RgtYb6Lsxz4SFM; Wed, 6 Sep 2023 20:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694030499; 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=22ptzlXxX0l+nywjqaBC5ggqmAnz6SL0m7bmv90ZurE=; b=E/QTipijDRnXrMw2waUNWbYa20RpIUJiJAA+6FlMN37Bgi1MhPXN9CEusku0PcfheqHHqM B2A8Ofl4RiRuf1j5WT7xJKW1FZONKDPYnp8F6lN9UCcJA4JnoZ0s/UeDTZRAocsxjAsHaT JhBbT5j9fEgXcuyJdNmpQOQtmjdHf7lm1ajnNQW8SQy09EgJam1sajigqo1nLWNDAIQ3PN ww09bpuXkZgXikLSS/DHbxtAIkakzee759yrCpcrjbkxtIPG1des4+h0Rtptlo2NQQYG9G G+LXCr4ulsd/c1yjAO/Yzgq5pmUs/L3rIiMU/xlf+uEuzjue82YruoVfksy5OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694030499; a=rsa-sha256; cv=none; b=P6X4gUe4JJPpwucuzf3Ar6eAbjSvphc+JaYevJa63U5Ip5/v8u/yZvypezRrxUEEZkHPtr 0YYkUZlqmQUr4S8FTA6QhUXGsk8NyWj4cBKApsECEczqmSsU/2szejYIebH1sZ17P3ooyw y2fG0fTTSFAlN9tGQmmQ+aBKlHJwGAg0uB+XhvxZj/mDPN/UCytr0X7ympP3B7saRzwhHE RN/C5GTN6X5MVTzJH7WbNx7KilNIBBBrffND3n8yEaz/DlrLfEcTcr+FzBtRfozGeNrFE3 qXGcWHjb9AejVCxNDKEUdr3Ckpo76G8qmfLZODi8CKdkBBOAcE65raxgy+UCFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694030499; 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=22ptzlXxX0l+nywjqaBC5ggqmAnz6SL0m7bmv90ZurE=; b=upaZq94ntXjK8C9OpMVOKTs/+fUnNtovlbLzRMfRzDkTyFvY/A5+SM1x+zi9zEgsmEfusg SG/xoRtV/ks1nZGc3sVu8v8ucM2lB4Sbl2zNEJdTyh+m5w59PtkGEZYB0YpScAGO8L+Pp9 BmfaZY/wq5fbqWYNkCCf53bjXTHjMerBUnDvuybB85/gsaYsz+Wkk63c0j/y18ARYN/h9B bFKsPSyuEhxUZrrDaPYjAk+pDH5oEqMT74ZQn+Xr+l25rxX2vUEmI0NNPHxV0Q/YBmeCsF 4Bky65AlUFIqwKkl6U5t9a21Tlikg3NNLiUUPEvhQ09J8Le+ire7zIDnQyWLBg== 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 4RgtYb5SSBzWB4; Wed, 6 Sep 2023 20:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386K1dlx031113; Wed, 6 Sep 2023 20:01:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386K1d2d031110; Wed, 6 Sep 2023 20:01:39 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:01:39 GMT Message-Id: <202309062001.386K1d2d031110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 8e8a66ab9c71 - 2023Q3 - databases/rocksdb: Do not delete built shared libraries before building static library List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 8e8a66ab9c7135cab030704486fe4c5487155151 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e8a66ab9c7135cab030704486fe4c5487155151 commit 8e8a66ab9c7135cab030704486fe4c5487155151 Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 21:39:13 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-06 20:01:21 +0000 databases/rocksdb: Do not delete built shared libraries before building static library Hope it would fix the build on the package building cluster. (cherry picked from commit b5c33f2db3696971ee290078164828d589062f2c) --- databases/rocksdb/files/patch-Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile index b77add08e6c1..f6dd90351cbe 100644 --- a/databases/rocksdb/files/patch-Makefile +++ b/databases/rocksdb/files/patch-Makefile @@ -42,3 +42,12 @@ all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(ROCKSDBTESTS_SUBSET) +@@ -1273,7 +1273,7 @@ package: + # Unit tests and tools + # --------------------------------------------------------------------------- + $(STATIC_LIBRARY): $(LIB_OBJECTS) +- $(AM_V_AR)rm -f $@ $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4) ++ $(AM_V_AR)rm -f $@ + $(AM_V_at)$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS) + + $(STATIC_TEST_LIBRARY): $(TEST_OBJECTS)