Source: libcds Version: 2.3.3-2 Severity: important Tags: ftbfs, patch User: debian-riscv@lists.debian.org Usertags: riscv64 X-Debbugs-Cc: debian-riscv@lists.debian.org, debian-mips@lists.debian.org, debian-s390@lists.debian.org Dear Maintainer, The package has a ftbfs issue on misp64el, s390x, riscv64 arch. like: ``` /<<PKGBUILDDIR>>/cds/algo/int_algo.h:80:28: error: redefinition of ‘uint64_t cds::beans::log2floor(uint64_t)’ static inline uint64_t log2floor( uint64_t n ) ^~~~~~~~~ In file included from /<<PKGBUILDDIR>>/cds/os/alloc_aligned.h:31, from /<<PKGBUILDDIR>>/cds/os/topology.h:14, ... from /<<PKGBUILDDIR>>/cds/init.h:10, from /<<PKGBUILDDIR>>/src/init.cpp:6: /<<PKGBUILDDIR>>/cds/algo/int_algo.h:80:28: error: redefinition of ‘uint64_t cds::beans::log2floor(uint64_t)’ ``` The full buildd log is here: https://buildd.debian.org/status/fetch.php?pkg=libcds&arch=riscv64&ver=2.3.3-2&stamp=1565549535&raw=0 https://buildd.debian.org/status/fetch.php?pkg=libcds&arch=mips64el&ver=2.3.3-2&stamp=1565604703&raw=0 https://buildd.debian.org/status/fetch.php?pkg=libcds&arch=s390x&ver=2.3.3-2&stamp=1569778976&raw=0 The patch I have tested it on my local machines, please consider to apply it in next upload. thanks. There is a PR to support s390x[0] and I will forward this patch to upstream also. [0]: https://github.com/khizmax/libcds -- Regards, -- Bo YU
diff -Nru libcds-2.3.3/debian/patches/fix-ftbfs-on-some-arch.patch libcds-2.3.3/debian/patches/fix-ftbfs-on-some-arch.patch --- libcds-2.3.3/debian/patches/fix-ftbfs-on-some-arch.patch 1970-01-01 07:30:00.000000000 +0730 +++ libcds-2.3.3/debian/patches/fix-ftbfs-on-some-arch.patch 2019-08-12 01:23:22.000000000 +0800 @@ -0,0 +1,25 @@ +Description: add support for riscv64, mips64el, s390x +Last-Update: 2022-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/cds/compiler/gcc/compiler_macro.h ++++ b/cds/compiler/gcc/compiler_macro.h +@@ -122,6 +122,18 @@ + # else + # define CDS_BUILD_BITS 32 + # endif ++#elif defined(__mips__) && defined(_MIPSEL) && _MIPS_SIM == _ABI64 ++# define CDS_PROCESSOR_ARCH CDS_PROCESSOR_MIPS64EL ++# define CDS_BUILD_BITS 64 ++# define CDS_PROCESSOR__NICK "mips64el" ++#elif defined(__riscv) && __riscv_xlen == 64 ++# define CDS_PROCESSOR_ARCH CDS_PROCESSOR_RISCV64 ++# define CDS_BUILD_BITS 64 ++# define CDS_PROCESSOR__NICK "riscv64" ++#elif defined(__s390x__) ++# define CDS_PROCESSOR_ARCH CDS_PROCESSOR_S390X ++# define CDS_BUILD_BITS 64 ++# define CDS_PROCESSOR__NICK "s390x" + #else + # if defined(CDS_USE_LIBCDS_ATOMIC) + # error "Libcds does not support atomic implementation for the processor architecture. Try to use C++11-compatible compiler and remove CDS_USE_LIBCDS_ATOMIC flag from compiler command line" diff -Nru libcds-2.3.3/debian/patches/series libcds-2.3.3/debian/patches/series --- libcds-2.3.3/debian/patches/series 1970-01-01 07:30:00.000000000 +0730 +++ libcds-2.3.3/debian/patches/series 2019-08-12 01:23:22.000000000 +0800 @@ -0,0 +1 @@ +fix-ftbfs-on-some-arch.patch
Attachment:
signature.asc
Description: PGP signature