diff options
Diffstat (limited to 'internal/rosa/libcap.go')
| -rw-r--r-- | internal/rosa/libcap.go | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/internal/rosa/libcap.go b/internal/rosa/libcap.go index 46492911..81a9ec63 100644 --- a/internal/rosa/libcap.go +++ b/internal/rosa/libcap.go @@ -7,17 +7,15 @@ func (t Toolchain) newLibcap() pkg.Artifact { version = "2.77" checksum = "2GOTFU4cl2QoS7Dv5wh0c9-hxsQwIzMB9Y_gfAo5xKHqcM13fiHt1RbPkfemzjmB" ) - return t.NewViaMake("libcap", version, t.NewPatchedSource( - "libcap", version, pkg.NewHTTPGetTar( - nil, "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/"+ - "snapshot/libcap-"+version+".tar.gz", - mustDecode(checksum), - pkg.TarGzip, - ), false, - ), &MakeAttr{ - Writable: true, - SkipConfigure: true, - InPlace: true, + return t.NewPackage("libcap", version, pkg.NewHTTPGetTar( + nil, "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/"+ + "snapshot/libcap-"+version+".tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), &PackageAttr{ + // uses source tree as scratch space + Writable: true, + Chmod: true, Env: []string{ "prefix=/system", @@ -25,16 +23,22 @@ func (t Toolchain) newLibcap() pkg.Artifact { }, ScriptEarly: ` ln -s ../system/bin/bash /bin/ -cd /usr/src/libcap `, + }, &MakeHelper{ + SkipConfigure: true, + InPlace: true, + Make: []string{ "CC=cc", "all", }, - Check: []string{"test"}, + Check: []string{ + "CC=cc", + "test", + }, }, - t.Load(Bash), - t.Load(Diffutils), + Bash, + Diffutils, ) } func init() { artifactsF[Libcap] = Toolchain.newLibcap } |