diff options
Diffstat (limited to 'internal/rosa/pkg-config.go')
| -rw-r--r-- | internal/rosa/pkg-config.go | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/internal/rosa/pkg-config.go b/internal/rosa/pkg-config.go index 1e3ff217..28a42dc0 100644 --- a/internal/rosa/pkg-config.go +++ b/internal/rosa/pkg-config.go @@ -7,25 +7,19 @@ func (t Toolchain) newPkgConfig() pkg.Artifact { version = "0.29.2" checksum = "gi7yAvkwo20Inys1tHbeYZ3Wjdm5VPkrnO0Q6_QZPCAwa1zrA8F4a63cdZDd-717" ) - return t.New("pkg-config-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(Gawk), - t.Load(Coreutils), - }, nil, nil, ` -cd "$(mktemp -d)" -/usr/src/pkg-config/configure \ - --prefix=/system \ - --build="${ROSA_TRIPLE}" \ - CFLAGS='-Wno-int-conversion' \ - --with-internal-glib -make "-j$(nproc)" check -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("pkg-config"), true, pkg.NewHTTPGetTar( + return t.NewViaMake("pkg-config", version, pkg.NewHTTPGetTar( nil, "https://pkgconfig.freedesktop.org/releases/"+ "pkg-config-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ))) + ), &MakeAttr{ + Writable: true, + + Configure: [][2]string{ + {"CFLAGS", "'-Wno-int-conversion'"}, + {"with-internal-glib"}, + }, + }) } func init() { artifactsF[PkgConfig] = Toolchain.newPkgConfig } |