rpms/toolbox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update the commit messages of the downstream patches

Browse Source 
Fedora now has a %{gobuildflags} RPM macro with only the flags used by
'go build ...'.

There's no need to do a build just for this.
This commit is contained in:
Debarshi Ray 2023-04-03 23:15:51 +02:00
parent 2f6e2b7cfe
commit 7ddc864959
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
View File

@ -1,24 +1,15 @@
From 17a0e519fd9b1e721b35a823bd244a28e3f87a4a Mon Sep 17 00:00:00 2001 From 865f58881c17c233f288b8978faaeba8b4b2c2f0 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org> From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 29 Jun 2020 17:57:47 +0200 Date: Mon, 29 Jun 2020 17:57:47 +0200
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuild} for Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
PPC64 for PPC64
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.
The Go toolchain also doesn't like the LDFLAGS environment variable as The Go toolchain also doesn't like the LDFLAGS environment variable as
exported by Fedora's %{meson} RPM macro. exported by Fedora's %{meson} RPM macro.
Note that these flags are only meant for the "ppc64" CPU architecture, Note that these flags are only meant for the "ppc64" CPU architecture,
and should be kept updated to match Fedora's Go guidelines. Use and should be kept updated to match Fedora's Go guidelines. Use
'rpm --eval "%{gobuild}"' to expand the %{gobuild} macro. 'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
--- ---
src/go-build-wrapper | 13 +++++++++---- src/go-build-wrapper | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-) 1 file changed, 9 insertions(+), 4 deletions(-)
@ -59,5 +50,5 @@ index c572d6dfb02b..cae2de426a96 100755
exit "$?" exit "$?"
-- --
2.39.1 2.39.2

19
toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
View File

@ -1,23 +1,14 @@
From fd03e31c7d789413700db84af02894d5be70b5ee Mon Sep 17 00:00:00 2001 From f4582e4748a15c462eac229f9bd9214415f166c9 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org> From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 29 Jun 2020 17:57:47 +0200 Date: Mon, 29 Jun 2020 17:57:47 +0200
Subject: [PATCH] build: Make the build flags match Fedora's %{gobuild} Subject: [PATCH] build: Make the build flags match Fedora's %{gobuildflags}
The Go toolchain doesn't play well with passing compiler and linker The Go toolchain doesn't like the LDFLAGS environment variable as
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.
The Go toolchain also doesn't like the LDFLAGS environment variable as
exported by Fedora's %{meson} RPM macro. exported by Fedora's %{meson} RPM macro.
Note that these flags are meant for every CPU architecture other than Note that these flags are meant for every CPU architecture other than
PPC64, and should be kept updated to match Fedora's Go guidelines. Use PPC64, and should be kept updated to match Fedora's Go guidelines. Use
'rpm --eval "%{gobuild}"' to expand the %{gobuild} macro. 'rpm --eval "%{gobuildflags}"' to expand the %{gobuildflags} macro.
--- ---
src/go-build-wrapper | 14 ++++++++++---- src/go-build-wrapper | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-) 1 file changed, 10 insertions(+), 4 deletions(-)
@ -59,5 +50,5 @@ index c572d6dfb02b..0e6a2efa6853 100755
exit "$?" exit "$?"
-- --
2.39.1 2.39.2