Re: Bug#1025376: libcds: FTBFS on mips64el, s390x, riscv64

Bo YU <[email protected]> Sat, 3 Dec 2022 22:59:51 +0800

Newsgroups	gmane.linux.debian.ports.alpha
Message-ID	<20221203145951.rzsjr5hjeudytc5n@debian>

Hi,
On Sat, Dec 03, 2022 at 02:30:14PM +0100, John Paul Adrian Glaubitz wrote:
>Hello Bo!
>
>On 12/3/22 14:12, Bo YU wrote:
>>The patch I have tested it on my local machines, please consider to
>>apply it in next upload. thanks.
>
>Could you please extend your patch to add support for alpha as well?
>
>For alpha, we need:
>
>#elif defined(__alpha__)
>#    define CDS_PROCESSOR_ARCH    CDS_PROCESSOR_ALPHA
>#    define CDS_BUILD_BITS        64
>#    define CDS_PROCESSOR__NICK   "alpha"
>

I have added support for alpha as your input and tested it on qemu.
Thanks.

-- 
Regards,
--
   Bo YU

fix-ftbfs-on-some-arch.debdiff (text/plain, 1.9 KB)

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,29 @@
+Description: add support for riscv64, mips64el, s390x, alpha
+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,22 @@
+ #   else
+ #       define CDS_BUILD_BITS        32
+ #   endif
++#elif defined(__alpha__)
++#    define CDS_PROCESSOR_ARCH    CDS_PROCESSOR_ALPHA
++#    define CDS_BUILD_BITS        64
++#    define CDS_PROCESSOR__NICK   "alpha"
++#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

signature.asc (application/pgp-signature, 833 B)