From 54466f0e43b858f36cace47ceb3cab121614f837 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 23 Oct 2026 04:16:07 +0900 Subject: internal/rosa: set pkg-config libdir We do not want to put up with the pkg-config wrappers. This does what the wrappers would have done. CMake does this automatically, but not meson and autotools. Signed-off-by: Ophestra --- internal/rosa/make.go | 7 +++++-- internal/rosa/meson.go | 5 ++++- internal/rosa/package/pcre2.az | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'internal/rosa') diff --git a/internal/rosa/make.go b/internal/rosa/make.go index c499de1e..e127fe02 100644 --- a/internal/rosa/make.go +++ b/internal/rosa/make.go @@ -116,13 +116,16 @@ func (attr *MakeHelper) script(t Toolchain, name string) string { attr = new(MakeHelper) } cross, arch := t.cross(), t.Arch() + sysroot := "/system/" + arch var configure string target := t.triple() if cross { configure += ` -export CC='clang --target=` + target + ` --sysroot=/system/` + arch + `' -export CXX='clang++ --target=` + target + ` --sysroot=/system/` + arch + `' +export CC='clang --target=` + target + ` --sysroot=` + sysroot + `' +export CXX='clang++ --target=` + target + ` --sysroot=` + sysroot + `' +export PKG_CONFIG_SYSROOT_DIR='` + sysroot + `' +export PKG_CONFIG_LIBDIR='` + sysroot + `/system/lib/pkgconfig:` + sysroot + `/system/share/pkgconfig' ` } diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go index 59029595..33cbb70a 100644 --- a/internal/rosa/meson.go +++ b/internal/rosa/meson.go @@ -74,7 +74,10 @@ strip = ['llvm-strip'] [properties] sys_root = '/system/`+arch+`' -pkg_config_libdir = '/system/`+arch+`/system/lib/pkgconfig' +pkg_config_libdir = [ + '/system/`+arch+`/system/lib/pkgconfig', + '/system/`+arch+`/system/share/pkgconfig' + ] [host_machine] cpu = '`+mesonArch+`' diff --git a/internal/rosa/package/pcre2.az b/internal/rosa/package/pcre2.az index f7600bc7..e964ced0 100644 --- a/internal/rosa/package/pcre2.az +++ b/internal/rosa/package/pcre2.az @@ -26,5 +26,4 @@ package pcre2 { ]; inputs = [ zlib ]; - runtime = [ zlib ]; } -- cgit v1.3.1