[packages/rocksdb] - request make targets sequentially, make static_lib removes shared library files

qboosh qboosh at pld-linux.org
Thu Sep 15 20:47:24 CEST 2022


commit 7e2f6267e04f81faf22136db26ddb17c95875061
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 15 20:47:42 2022 +0200

    - request make targets sequentially, make static_lib removes shared library files

 rocksdb.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/rocksdb.spec b/rocksdb.spec
index 53ed5a1..57cdde9 100644
--- a/rocksdb.spec
+++ b/rocksdb.spec
@@ -87,10 +87,11 @@ export ROCKSDB_DISABLE_BENCHMARK=1
 export ROCKSDB_DISABLE_TBB=1
 %endif
 
+for target in %{?with_static_libs:static_lib} shared_lib tools_lib tools %{?with_tests:check} ; do
 %ifarch i386 i486
 PLATFORM_LDFLAGS="-latomic" \
 %endif
-%{__make} shared_lib %{?with_static_libs:static_lib} tools tools_lib %{?with_tests:check} \
+%{__make} $target \
 	AM_DEFAULT_VERBOSITY=1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -100,6 +101,7 @@ PLATFORM_LDFLAGS="-latomic" \
 	PORTABLE=1 \
 	USE_RTTI=1 \
 	WARNING_FLAGS="%{rpmcppflags} -Wall"
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -111,8 +113,6 @@ export ROCKSDB_DISABLE_BENCHMARK=1
 export ROCKSDB_DISABLE_TBB=1
 %endif
 
-ls -la
-
 %{__make} install \
 	%{!?with_debug:DEBUG_LEVEL=0} \
 	PORTABLE=1 \
@@ -120,8 +120,6 @@ ls -la
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir}
 
-ls -la
-
 # reduntant symlink
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/librocksdb.so.6
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rocksdb.git/commitdiff/7e2f6267e04f81faf22136db26ddb17c95875061



More information about the pld-cvs-commit mailing list