[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1026844: scm: fix ftbfs on riscv64, mips64el, s390x



Source: scm
Version: 5f3-2
Severity: important
Tags: ftbfs patch
User: debian-riscv@lists.debian.org
Usertags: riscv64
X-Debbugs-Cc: debian-riscv@lists.debian.org

Dear Maintainer,


The package has ftbfs issue on mips64el, s390x and riscv64 due to:
```
#define SHORT_INT
in scmfig.h and recompile scm
make[3]: *** [Makefile:553: checklit] Error 1
make[3]: Leaving directory '/<<PKGBUILDDIR>>'
make[2]: *** [Makefile:354: scmlit] Error 2
make[2]: Leaving directory '/<<PKGBUILDDIR>>'
make[1]: *** [debian/rules:32: override_dh_auto_build] Error 2
make[1]: Leaving directory '/<<PKGBUILDDIR>>'
make: *** [debian/rules:19: binary-arch] Error 2
```

The full build log is here:
https://buildd.debian.org/status/fetch.php?pkg=scm&arch=mips64el&ver=5f3-2&stamp=1671594837&raw=0

https://buildd.debian.org/status/fetch.php?pkg=scm&arch=s390x&ver=5f3-2&stamp=1671590229&raw=0

https://buildd.debian.org/status/fetch.php?pkg=scm&arch=riscv64&ver=5f3-2&stamp=1671546696&raw=0

The pacth is trying to fix these issues and I have tested it. Please let
me know if there is any issue. Thanks.

BR,
Bo


-- 
Regards,
--
  Bo YU

diff -Nru scm-5f3/debian/changelog scm-5f3/debian/changelog
--- scm-5f3/debian/changelog	2021-12-03 00:31:25.000000000 +0800
+++ scm-5f3/debian/changelog	2022-12-22 18:37:03.000000000 +0800
@@ -1,3 +1,10 @@
+scm (5f3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add supoort for riscv64, mips64el, s390x. (Closes: #-1, #387087)
+
+ -- Bo YU <tsu.yubo@gmail.com>  Thu, 22 Dec 2022 18:37:03 +0800
+
 scm (5f3-1) unstable; urgency=medium
 
   * Update debian/watch uscan support file
diff -Nru scm-5f3/debian/patches/series scm-5f3/debian/patches/series
--- scm-5f3/debian/patches/series	2021-12-02 05:23:26.000000000 +0800
+++ scm-5f3/debian/patches/series	2022-12-22 18:07:35.000000000 +0800
@@ -5,3 +5,4 @@
 add-missing-edit-line-feature.patch
 fix-argument-imm-being-ignored-in-m_letstar1.patch
 fix-readline-related-bug.patch
+support-rv64-mips64el-s390x.patch
diff -Nru scm-5f3/debian/patches/support-rv64-mips64el-s390x.patch scm-5f3/debian/patches/support-rv64-mips64el-s390x.patch
--- scm-5f3/debian/patches/support-rv64-mips64el-s390x.patch	1970-01-01 07:30:00.000000000 +0730
+++ scm-5f3/debian/patches/support-rv64-mips64el-s390x.patch	2022-12-22 18:11:36.000000000 +0800
@@ -0,0 +1,21 @@
+--- a/scmfig.h
++++ b/scmfig.h
+@@ -272,6 +272,18 @@
+ # define SHORT_INT
+ # define CDR_DOUBLES
+ #endif
++#ifdef __mips__ && _MIPSEL && _MIPS_SIM==_ABI64
++# define SHORT_INT
++# define CDR_DOUBLES
++#endif
++#ifdef __riscv && __riscv_xlen==64
++# define SHORT_INT
++# define CDR_DOUBLES
++#endif
++#ifdef __s390x__
++# define SHORT_INT
++# define CDR_DOUBLES
++#endif
+ #ifdef MSDOS			/* Microsoft C 5.10 and 6.00A */
+ # ifndef GO32
+ #  define SHORT_INT

Attachment: signature.asc
Description: PGP signature


Reply to: