Source: burrow
Version: 1.2.1-3
Severity: serious
Tags: ftbfs patch
User: debian-ri...@lists.debian.org
Usertags: riscv64
X-Debbugs-Cc: debian-ri...@lists.debian.org, mengz...@iscas.ac.cn

Dear Maintainer,

Thanks for the build support on riscv64 in previous upload.

But unforuntately, there is still failed to build it on riscv64:

```
github.com/linkedin/Burrow/core/internal/zookeeper
github.com/linkedin/Burrow/core
# github.com/linkedin/Burrow/core
src/github.com/linkedin/Burrow/core/open_out_log_unix.go:22:17: undefined: 
syscall.Dup2
dh_auto_build: error: cd obj-riscv64-linux-gnu && go install -trimpath -v -p 4 
github.com/linkedin/Burrow github.com/linkedin/Burrow/core 
github.com/linkedin/Burrow/core/internal 
github.com/linkedin/Burrow/core/internal/cluster 
github.com/linkedin/Burrow/core/internal/consumer 
github.com/linkedin/Burrow/core/internal/evaluator 
github.com/linkedin/Burrow/core/internal/helpers 
github.com/linkedin/Burrow/core/internal/httpserver 
github.com/linkedin/Burrow/core/internal/notifier 
github.com/linkedin/Burrow/core/internal/storage 
github.com/linkedin/Burrow/core/internal/zookeeper 
github.com/linkedin/Burrow/core/protocol returned exit code 1
make: *** [debian/rules:11: binary-arch] Error 25
```

The full buildd log is here:
https://buildd.debian.org/status/fetch.php?pkg=burrow&arch=riscv64&ver=1.2.1-3&stamp=1730811760&raw=0

It seems PR #763 of upstream which supports riscv64 did not included
correctly in the patch(it's really esay to get lost indeed).

Thanks for Meng Zhuo's kindly help and proposed patch, the ftbfs issue
has been fixed with the attached patch and has been tested on my
Unmatched board. Could you apply it at next upload? TIA.


-- 
Regards,
--
  Bo YU

diff -Nru burrow-1.2.1/debian/changelog burrow-1.2.1/debian/changelog
--- burrow-1.2.1/debian/changelog       2024-11-05 09:00:00.000000000 +0800
+++ burrow-1.2.1/debian/changelog       2024-11-06 12:04:24.000000000 +0800
@@ -1,3 +1,10 @@
+burrow (1.2.1-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs on riscv64. (Closes: #-1)
+
+ -- Bo YU <tsu.y...@gmail.com>  Wed, 06 Nov 2024 12:04:24 +0800
+
 burrow (1.2.1-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru burrow-1.2.1/debian/patches/riscv64-loong64.patch 
burrow-1.2.1/debian/patches/riscv64-loong64.patch
--- burrow-1.2.1/debian/patches/riscv64-loong64.patch   2024-11-05 
08:57:36.000000000 +0800
+++ burrow-1.2.1/debian/patches/riscv64-loong64.patch   2024-11-06 
12:04:24.000000000 +0800
@@ -1,9 +1,12 @@
 Description: Adapt upstream PR for riscv64 and loong64
 Author: Gianfranco Costamagna <locutusofb...@debian.org>
+        Meng Zhuo <mengz...@iscas.ac.cn>
 Bug-Debian: https://bugs.debian.org/1042514
 Bug-Debian: https://bugs.debian.org/1055081
 Last-Update: 2024-11-02
 
+Index: b/core/open_out_log_linux_loong64.go
+===================================================================
 --- /dev/null
 +++ b/core/open_out_log_linux_loong64.go
 @@ -0,0 +1,23 @@
@@ -30,11 +33,14 @@
 +func internalDup2(oldfd uintptr, newfd uintptr) error {
 +      return syscall.Dup3(int(oldfd), int(newfd), 0)
 +}
+Index: b/core/open_out_log_linux_dup3.go
+===================================================================
 --- /dev/null
 +++ b/core/open_out_log_linux_dup3.go
-@@ -0,0 +1,24 @@
-+// +build linux,arm64
-+// +build linux,riscv64
+@@ -0,0 +1,25 @@
++//go:build linux && (arm64 || riscv64)
++// +build linux
++// +build arm64,riscv64
 +
 +/* Copyright 2017 LinkedIn Corp. Licensed under the Apache License, Version
 + * 2.0 (the "License"); you may not use this file except in compliance with
@@ -57,12 +63,45 @@
 +func internalDup2(oldfd uintptr, newfd uintptr) error {
 +      return syscall.Dup3(int(oldfd), int(newfd), 0)
 +}
+Index: b/core/open_out_log_unix.go
+===================================================================
 --- a/core/open_out_log_unix.go
 +++ b/core/open_out_log_unix.go
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,8 @@
++//go:build !windows && !(linux && arm64) && !(linux && loong64) && !(linux && 
riscv64)
  // +build !windows
- // +build !arm64
-+// +build !loong64
+-// +build !arm64
++// +build !linux !arm64
++// +build !linux !loong64
++// +build !linux !riscv64
  
  /* Copyright 2017 LinkedIn Corp. Licensed under the Apache License, Version
   * 2.0 (the "License"); you may not use this file except in compliance with
+Index: b/core/open_out_log_linux_arm64.go
+===================================================================
+--- a/core/open_out_log_linux_arm64.go
++++ /dev/null
+@@ -1,23 +0,0 @@
+-// +build linux,arm64
+-
+-/* Copyright 2017 LinkedIn Corp. Licensed under the Apache License, Version
+- * 2.0 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- */
+-
+-package core
+-
+-import (
+-      "syscall"
+-)
+-
+-// linux_arm64 doesn't have syscall.Dup2, so use
+-// the nearly identical syscall.Dup3 instead
+-func internalDup2(oldfd uintptr, newfd uintptr) error {
+-      return syscall.Dup3(int(oldfd), int(newfd), 0)
+-}

Attachment: signature.asc
Description: PGP signature

Reply via email to