From cbcdb7a21c89122edc71ab297533b6d0615b63fd Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 23 Feb 2023 15:22:14 +0100 Subject: [PATCH] Simplify and unify the build with RHEL There's no need to do a build just for this. --- toolbox.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/toolbox.spec b/toolbox.spec index bdc8c3d..1610734 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -169,18 +169,14 @@ The %{name}-tests package contains system tests for %{name}. %patch103 -p1 %endif -%gomkdir +%gomkdir -s %{_builddir}/%{extractdir}/src %{?rhel:-k} %build export %{gomodulesmode} export GOPATH=%{gobuilddir}:%{gopath} export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -ln -s src/cmd cmd -ln -s src/pkg pkg -%if 0%{?rhel} -ln -s src/vendor vendor -%endif + %meson -Dprofile_dir=%{_sysconfdir}/profile.d -Dtmpfiles_dir=%{_tmpfilesdir} %meson_build