Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Sep 2023 21:40:57 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b5c33f2db369 - main - databases/rocksdb: Do not delete built shared libraries before building static library
Message-ID:  <202309042140.384LevWv011771@gitrepo.freebsd.org>

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

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

commit b5c33f2db3696971ee290078164828d589062f2c
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-09-04 21:39:13 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-09-04 21:39:13 +0000

    databases/rocksdb: Do not delete built shared libraries before building static library
    
    Hope it would fix the build on the package building cluster.
---
 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)



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