diff options
Diffstat (limited to 'internal/rosa/libexpat.go')
| -rw-r--r-- | internal/rosa/libexpat.go | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/internal/rosa/libexpat.go b/internal/rosa/libexpat.go index 2139e442..3e094f7b 100644 --- a/internal/rosa/libexpat.go +++ b/internal/rosa/libexpat.go @@ -11,25 +11,18 @@ func (t Toolchain) newLibexpat() pkg.Artifact { version = "2.7.3" checksum = "GmkoD23nRi9cMT0cgG1XRMrZWD82UcOMzkkvP1gkwSFWCBgeSXMuoLpa8-v8kxW-" ) - return t.New("libexpat-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(Bash), - t.Load(Gawk), - t.Load(Coreutils), - }, nil, nil, ` -cd "$(mktemp -d)" -/usr/src/libexpat/configure \ - --prefix=/system \ - --build="${ROSA_TRIPLE}" \ - --enable-static -make "-j$(nproc)" check -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("libexpat"), false, pkg.NewHTTPGetTar( + return t.NewViaMake("libexpat", version, pkg.NewHTTPGetTar( nil, "https://github.com/libexpat/libexpat/releases/download/"+ "R_"+strings.ReplaceAll(version, ".", "_")+"/"+ "expat-"+version+".tar.bz2", mustDecode(checksum), pkg.TarBzip2, - ))) + ), &MakeAttr{ + Configure: [][2]string{ + {"enable-static"}, + }, + }, + t.Load(Bash), + ) } func init() { artifactsF[Libexpat] = Toolchain.newLibexpat } |