diff --git a/internal/rosa/gnu.go b/internal/rosa/gnu.go index c3c48680..603f23a6 100644 --- a/internal/rosa/gnu.go +++ b/internal/rosa/gnu.go @@ -635,7 +635,7 @@ func (t Toolchain) newFindutils() (pkg.Artifact, string) { nil, "https://ftpmirror.gnu.org/gnu/findutils/findutils-"+version+".tar.xz", mustDecode(checksum), ), &PackageAttr{ - SourceKind: sourceTarXZ, + SourceKind: SourceKindTarXZ, ScriptEarly: ` echo '#!/bin/sh' > gnulib-tests/test-c32ispunct.sh echo 'int main(){return 0;}' > tests/xargs/test-sigusr.c diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go index e88bced7..e1d2e75a 100644 --- a/internal/rosa/gtk.go +++ b/internal/rosa/gtk.go @@ -18,7 +18,7 @@ func (t Toolchain) newGLib() (pkg.Artifact, string) { "/glib-"+version+".tar.xz", mustDecode(checksum), ), &PackageAttr{ - SourceKind: sourceTarXZ, + SourceKind: SourceKindTarXZ, Paths: []pkg.ExecPath{ pkg.Path(fhs.AbsEtc.Append( diff --git a/internal/rosa/libxml2.go b/internal/rosa/libxml2.go index 20243d7a..6f48ebf0 100644 --- a/internal/rosa/libxml2.go +++ b/internal/rosa/libxml2.go @@ -17,7 +17,7 @@ func (t Toolchain) newLibxml2() (pkg.Artifact, string) { "/libxml2-"+version+".tar.xz", mustDecode(checksum), ), &PackageAttr{ - SourceKind: sourceTarXZ, + SourceKind: SourceKindTarXZ, }, (*MakeHelper)(nil), Diffutils, XZ, diff --git a/internal/rosa/libxslt.go b/internal/rosa/libxslt.go index 9f0c3d2b..c979694a 100644 --- a/internal/rosa/libxslt.go +++ b/internal/rosa/libxslt.go @@ -17,7 +17,7 @@ func (t Toolchain) newLibxslt() (pkg.Artifact, string) { "/libxslt-"+version+".tar.xz", mustDecode(checksum), ), &PackageAttr{ - SourceKind: sourceTarXZ, + SourceKind: SourceKindTarXZ, }, &MakeHelper{ // python libxml2 cyclic dependency SkipCheck: true, diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index a28fd836..47ccddab 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -426,8 +426,8 @@ type Helper interface { } const ( - // sourceTarXZ denotes a source tarball to be decompressed using [XZ]. - sourceTarXZ = 1 + iota + // SourceKindTarXZ denotes a source tarball to be decompressed using [XZ]. + SourceKindTarXZ = 1 + iota ) // PackageAttr holds build-system-agnostic attributes. @@ -546,7 +546,7 @@ func (t Toolchain) NewPackage( var sourceSuffix string switch attr.SourceKind { - case sourceTarXZ: + case SourceKindTarXZ: sourceSuffix = ".tar.xz" scriptEarly += ` tar -C /usr/src/ -xf '/usr/src/` + name + `.tar.xz'