[packages/libcds] - fixed library install on x32 ABI, require cx16 feature on x86_64 targets; release 2
qboosh
qboosh at pld-linux.org
Sun Apr 5 09:49:07 CEST 2026
commit f554c58e06a1a3bbe3d70cb470d4040e478fb02e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 5 09:49:32 2026 +0200
- fixed library install on x32 ABI, require cx16 feature on x86_64 targets; release 2
libcds-libdir.patch | 10 +++++++++-
libcds.spec | 5 ++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/libcds.spec b/libcds.spec
index 9636eee..7526aa6 100644
--- a/libcds.spec
+++ b/libcds.spec
@@ -6,7 +6,7 @@ Summary: Concurrent Data Structers library
Summary(pl.UTF-8): Biblioteka współbieżnych struktur danych (Concurrent Data Structures)
Name: libcds
Version: 2.3.3
-Release: 1
+Release: 2
License: Boost v1.0
Group: Libraries
#Source0Download: https://github.com/khizmax/libcds/releases
@@ -20,6 +20,9 @@ BuildRequires: cmake >= 3.0.2
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: rpm-build >= 4.6
+%ifarch %{x8664} x32
+Requires: cpuinfo(cx16)
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
diff --git a/libcds-libdir.patch b/libcds-libdir.patch
index 43a232d..a231d2b 100644
--- a/libcds-libdir.patch
+++ b/libcds-libdir.patch
@@ -1,6 +1,14 @@
--- libcds-2.3.3/CMakeLists.txt.orig 2018-12-31 17:30:07.000000000 +0100
+++ libcds-2.3.3/CMakeLists.txt 2026-04-05 09:28:37.161877303 +0200
-@@ -189,7 +189,7 @@ target_compile_options(${CDS_STATIC_LIBR
+@@ -114,7 +114,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX
+
+ if(CMAKE_TARGET_ARCHITECTURE STREQUAL "x86_64")
+ list(APPEND LIBCDS_PUBLIC_CXX_FLAGS "-mcx16")
+- set(LIB_SUFFIX "64")
+
+ # GCC-7: 128-bit atomics support is implemented via libatomic on amd64
+ # see https://gcc.gnu.org/ml/gcc/2017-01/msg00167.html
+@@ -189,7 +188,7 @@ target_compile_options(${CDS_STATIC_LIBR
install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT} NAMELINK_SKIP RUNTIME DESTINATION lib${LIB_SUFFIX})
install(TARGETS ${CDS_SHARED_LIBRARY} EXPORT LibCDSConfig LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT ${HEADERS_COMPONENT} NAMELINK_ONLY)
install(TARGETS ${CDS_STATIC_LIBRARY} EXPORT LibCDSConfig DESTINATION lib${LIB_SUFFIX} COMPONENT ${LIBRARIES_COMPONENT})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcds.git/commitdiff/f554c58e06a1a3bbe3d70cb470d4040e478fb02e
More information about the pld-cvs-commit
mailing list