From 0d39eb6e9bdc80eb7c1064c41eb20101af0c52fb Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 17 Jun 2023 22:03:43 +0000 Subject: [PATCH] WIP: graphics/MesaLib: Make this cross-compile. Requires kludging up an `llvm-config' tool that runs at build-time. The lang/libLLVM package installs an llvm-config tool, but it's compiled to run on the target system, not on the build system, so it doesn't work in cross-compiling. --- graphics/MesaLib/Makefile | 8 ++++++ graphics/MesaLib/distinfo | 2 ++ graphics/MesaLib/options.mk | 27 +++++++++++++++++++ graphics/MesaLib/patches/patch-meson.build | 19 +++++++++++++ .../MesaLib/patches/patch-meson__options.txt | 17 ++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 graphics/MesaLib/patches/patch-meson.build create mode 100644 graphics/MesaLib/patches/patch-meson__options.txt diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 17207a0719ae..2ca71556ad3a 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -183,6 +183,14 @@ PKGCONFIG_OVERRIDE+= output/meson-private/osmesa.pc PKGCONFIG_OVERRIDE+= output/meson-private/xatracker.pc PKGCONFIG_OVERRIDE+= output/meson-private/gl.pc +.include "../../mk/bsd.prefs.mk" + +.if ${USE_CROSS_COMPILE:tl} == "yes" +# wayland-protocols abuses pc_sysrootdir in its .pc files, causing the +# cross-destdir to be prefixed twice to paths. +ALL_ENV+= PKG_CONFIG_FDO_SYSROOT_RULES=1 +.endif + post-install: ${MV} ${DESTDIR}${PREFIX}/share/drirc.d/00-mesa-defaults.conf ${DESTDIR}${EGDIR} .if ${OPSYS} == "Darwin" && !empty(PKG_OPTIONS:Mx11) diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo index 42386fa71f7b..c55b00dd6d2d 100644 --- a/graphics/MesaLib/distinfo +++ b/graphics/MesaLib/distinfo @@ -3,6 +3,8 @@ $NetBSD: distinfo,v 1.166 2023/07/18 19:33:31 ryoon Exp $ BLAKE2s (mesa-21.3.9.tar.xz) = e948a37881a088c0df4df880e3d1218b874ed5a8cac951a109249b3648519472 SHA512 (mesa-21.3.9.tar.xz) = 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684 Size (mesa-21.3.9.tar.xz) = 16607716 bytes +SHA1 (patch-meson.build) = acdbb73bde03a297a7c080c33edb317c8d838adc +SHA1 (patch-meson__options.txt) = af1cb551056b0f85cf12d1226b8cea368b0284de SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336 SHA1 (patch-src_drm-shim_drm__shim.c) = 6884d31dc3e9d47aac1785589ab289a601e64545 SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 9230fbae2c04246ebca8437ecad694bbae857fbe diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 746a6a01cb5d..6b30a75fe0e1 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -81,6 +81,32 @@ GALLIUM_DRIVERS+= r600 PLIST.radeonsi= yes GALLIUM_DRIVERS+= radeonsi . endif + +. if ${USE_CROSS_COMPILE:tl} == "yes" +# XXX whattakludge +LIBLLVM_COMPONENTS= aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwp engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray +MESON_BINARIES+= llvm-config +MESON_BINARY.llvm-config= ${TOOLS_DIR}/bin/llvm-config +TOOLS_CREATE+= llvm-config +TOOLS_SCRIPT.llvm-config= \ + while [ $$\# -gt 0 ]; do \ + case $$1 in \ + --components) echo ${LIBLLVM_COMPONENTS};; \ + --cppflags) echo -I${BUILDLINK_PREFIX.libLLVM:Q}/include;; \ + --has-rtti) echo YES;; \ + --libdir) echo ${BUILDLINK_PREFIX.libLLVM:Q}/lib;; \ + --ldflags) echo -L${BUILDLINK_PREFIX.libLLVM:Q}/lib \ + ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libLLVM:Q}/lib;; \ + --libs) echo -lLLVM-13;; \ + --link-shared) ;; \ + --shared-mode) echo shared;; \ + --version) echo 13.0.2;; \ + --*) echo unknown option; exit 1;; \ + esac; \ + shift; \ + done +. endif + .else MESON_ARGS+= -Dllvm=disabled .endif @@ -140,6 +166,7 @@ MESON_ARGS+= -Dgallium-vdpau=false # .if !empty(PKG_OPTIONS:Mwayland) MESA_PLATFORMS+= wayland +TOOL_DEPENDS+= ${BUILDLINK_API_DEPENDS.wayland:=:../../devel/wayland} . include "../../devel/wayland/buildlink3.mk" . include "../../devel/wayland-protocols/buildlink3.mk" .endif diff --git a/graphics/MesaLib/patches/patch-meson.build b/graphics/MesaLib/patches/patch-meson.build new file mode 100644 index 000000000000..f4830c302d55 --- /dev/null +++ b/graphics/MesaLib/patches/patch-meson.build @@ -0,0 +1,19 @@ +$NetBSD$ + +Add a wayland-scanner option so we can pass the path through from the +Makefile for cross-builds. + +--- meson.build.orig 2022-06-08 18:13:35.000000000 +0000 ++++ meson.build +@@ -2004,7 +2004,11 @@ endif + + if with_platform_wayland + dep_wl_scanner = dependency('wayland-scanner', native: true) ++ if meson.is_cross_build() ++ prog_wl_scanner = find_program(get_option('wayland-scanner')) ++ else + prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ endif + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else diff --git a/graphics/MesaLib/patches/patch-meson__options.txt b/graphics/MesaLib/patches/patch-meson__options.txt new file mode 100644 index 000000000000..e06c683047fd --- /dev/null +++ b/graphics/MesaLib/patches/patch-meson__options.txt @@ -0,0 +1,17 @@ +$NetBSD$ + +Add a wayland-scanner option so we can pass the path through from the +Makefile for cross-builds. + +--- meson_options.txt.orig 2022-06-08 18:13:35.000000000 +0000 ++++ meson_options.txt +@@ -539,3 +539,9 @@ option( + value : false, + description : 'Configure LTS build to coexist with Mesa >= 22.0' + ) ++option( ++ 'wayland-scanner', ++ type : 'string', ++ value : 'wayland-scanner', ++ description : 'Path to build-time wayland-scanner binary' ++)