ba60453d21
Toolbox is now written in Go, so this is no longer a noarch package.
Unlike idiomatic Go code-bases, Toolbox uses the Meson build system to
check for additional non-Go dependencies and install various auxilliary
files. This leads to some interesting problems.
The Go toolchain doesn't play well with passing compiler and linker
flags via environment variables. The linker flags require a second
level of quoting, which leaves the build system without a quote level
to assign the flags to an environment variable like GOFLAGS.
This is one reason why Fedora doesn't have a RPM macro with only the
flags. The %{gobuild} RPM macro includes the entire 'go build ...'
invocation.
Therefore, the entire 'go build ...' invocation is swapped out using a
set of downstream patches (one for PPC64 because it doesn't use
'-buildmode pie', and another for other CPU architectures) to match
the %{gobuild} RPM macro.
The Go toolchain also doesn't like the LDFLAGS environment variable as
exported by Fedora's %{meson} RPM macro.
For some reason, when built on Koji, the final binary gets created as
../src/src instead of ../src/toolbox, but it doesn't happen when
building locally with 'rpmbuild -ba ...'. Hence it's necessary to
explicitly specify the name of the output binary.
Finally, Fedora doesn't support Go modules when building Go programs.
This means that Go's semantic import versioning can't be used.
A conscious effort was made to minimize the use of exotic Go-specific
RPM macros to retain the legibility of the spec file. A proliferation
of such RPM macros is a hindrance for those who are not experts in the
ins and outs of packaging Go code in Fedora.
Some changes by Debarshi Ray.
https://src.fedoraproject.org/rpms/toolbox/pull-request/2
31 lines
1013 B
Diff
31 lines
1013 B
Diff
From 38d6d4702c05dfa7dd48bdd70d57348ad24ca877 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Tue, 30 Jun 2020 18:30:26 +0200
|
|
Subject: [PATCH] pkg/utils: Make it build on aarch64
|
|
|
|
The syscall.Dup2 wrapper isn't defined on aarch64, which breaks the
|
|
build as:
|
|
../../pkg/utils/utils.go:551:12: undefined: syscall.Dup2
|
|
|
|
https://github.com/containers/toolbox/pull/486
|
|
---
|
|
src/pkg/utils/utils.go | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
|
|
index 08de2997865a..6d38b709fb7a 100644
|
|
--- a/src/pkg/utils/utils.go
|
|
+++ b/src/pkg/utils/utils.go
|
|
@@ -548,7 +548,7 @@ func ShowManual(manual string) error {
|
|
stderrFdInt := int(stderrFd)
|
|
stdoutFd := os.Stdout.Fd()
|
|
stdoutFdInt := int(stdoutFd)
|
|
- if err := syscall.Dup2(stdoutFdInt, stderrFdInt); err != nil {
|
|
+ if err := syscall.Dup3(stdoutFdInt, stderrFdInt, 0); err != nil {
|
|
return errors.New("failed to redirect standard error to standard output")
|
|
}
|
|
|
|
--
|
|
2.25.4
|
|
|