Replace build wrapper with native meson targets

Author: PeakKS

src/go-build-wrapper

@@ -1,11 +1,6 @@
-go_build_wrapper_file = files('go-build-wrapper')
-go_build_wrapper_program = find_program('go-build-wrapper')
-
-meson_generate_completions_program = find_program('meson_generate_completions.py')
 meson_go_fmt_program = find_program('meson_go_fmt.py')
 
 sources = files(
-  'toolbox.go',
   'cmd/completion.go',
   'cmd/create.go',
   'cmd/enter.go',
@@ -22,120 +17,122 @@ sources = files(
   'cmd/utils.go',
   'pkg/nvidia/nvidia.go',
   'pkg/podman/container.go',
+  'pkg/podman/containerInspect_test.go',
   'pkg/podman/errors.go',
   'pkg/podman/podman.go',
-  'pkg/podman/containerInspect_test.go',
   'pkg/shell/shell.go',
   'pkg/shell/shell_test.go',
   'pkg/skopeo/skopeo.go',
   'pkg/term/term.go',
   'pkg/term/term_test.go',
-  'pkg/utils/libsubid-wrappers.c',
   'pkg/utils/arch.go',
   'pkg/utils/errors.go',
   'pkg/utils/fedora.go',
+  'pkg/utils/libsubid-wrappers.c',
   'pkg/utils/rhel.go',
   'pkg/utils/utils.go',
   'pkg/utils/utils_cgo.go',
   'pkg/utils/utils_test.go',
   'pkg/version/version.go',
 )
 
-cpu_family = host_machine.cpu_family()
-endian = host_machine.endian()
+toolbox_go = custom_target(
+  'toolbox',
+  command: [
+    go,
+    'build',
+    '-C', meson.current_source_dir(),
+    '-trimpath',
+    '-buildmode=c-archive',
+    '-o', meson.project_build_root() + '/@OUTPUT@',
+    '@INPUT@',
+  ],
+  depend_files: sources,
+  input: 'toolbox.go',
+  output: 'toolbox.a',
+)
+
+cc_exe = cc.cmd_array().get(-1)
+readlink = find_program('readlink')
+dirname = find_program('dirname')
 
-dynamic_linker = ''
-if cpu_family == 'aarch64' and endian == 'little'
-  dynamic_linker = '/lib/ld-linux-aarch64.so.1'
-elif cpu_family == 'arm' and endian == 'little'
-  dynamic_linker = '/lib/ld-linux-armhf.so.3'
-elif cpu_family == 'loongarch64' and endian == 'little'
-  dynamic_linker = '/lib64/ld-linux-loongarch-lp64d.so.1'
-elif cpu_family == 'ppc64' and endian == 'little'
-  dynamic_linker = '/lib64/ld64.so.2'
-elif cpu_family == 's390x' and endian == 'big'
-  dynamic_linker = '/lib/ld64.so.1'
-elif cpu_family == 'x86' and endian == 'little'
-  dynamic_linker = '/lib/ld-linux.so.2'
-elif cpu_family == 'x86_64' and endian == 'little'
-  dynamic_linker = '/lib64/ld-linux-x86-64.so.2'
-elif cpu_family == 'riscv64' and endian == 'little'
-  dynamic_linker = '/lib/ld-linux-riscv64-lp64d.so.1'
-else
-  host_machine_description = cpu_family + ' (' + endian + ' endian)'
-  error('Please specify dynamic linker for:', host_machine_description)
-endif
+libc_path = run_command(cc_exe, '--print-file-name=libc.so', capture: true, check: true).stdout()
+libc_canon = run_command(readlink, '--canonicalize', libc_path, capture: true, check: true).stdout()
+libc_dir = run_command(dirname, libc_canon, capture: true, check: true).stdout().strip()
 
-message('Host machine dynamic linker:', dynamic_linker)
+message('Host machine libc:', libc_dir)
 
-toolbox_go = custom_target(
+rpath = '/run/host' + libc_dir
+message('Setting rpath:', rpath)
+
+toolbox = executable(
   'toolbox',
-  command: [
-    go_build_wrapper_program,
-    meson.current_source_dir(),
-    meson.project_build_root(),
-    '@OUTPUT@',
-    meson.project_version(),
-    cc.cmd_array().get(-1),
-    dynamic_linker,
-    migration_path_for_coreos_toolbox.to_string(),
+  sources: [],
+  link_whole: toolbox_go,
+  link_args: [
+    '-Wl,-z,lazy',
+    '-Wl,--export-dynamic',
+    '-Wl,--unresolved-symbols=ignore-in-object-files',
   ],
-  input: sources,
+  build_rpath: rpath,
+  install_rpath: rpath,
   install: true,
   install_dir: get_option('bindir'),
-  output: 'toolbox',
 )
 
 if bashcompletionsdir != ''
   custom_target(
     'bash-completion',
     capture: true,
     command: [
-      meson_generate_completions_program,
-      meson.current_source_dir(),
+      toolbox,
+      'completion',
       'bash',
     ],
-    depends: [toolbox_go],
     install: true,
     install_dir: bashcompletionsdir,
     output: 'toolbox.bash',
-)
+  )
 endif
 
 if fishcompletionsdir != ''
   custom_target(
     'fish-completion',
     capture: true,
     command: [
-      meson_generate_completions_program,
-      meson.current_source_dir(),
+      toolbox,
+      'completion',
       'fish',
     ],
-    depends: [toolbox_go],
     install: true,
     install_dir: fishcompletionsdir,
     output: 'toolbox.fish',
-)
+  )
 endif
 
 custom_target(
   'zsh-completion',
   capture: true,
   command: [
-    meson_generate_completions_program,
-    meson.current_source_dir(),
+    toolbox,
+    'completion',
     'zsh',
   ],
-  depends: [toolbox_go],
   install: true,
   install_dir: zshcompletionsdir,
   output: '_toolbox',
 )
 
-if shellcheck.found()
-  test('shellcheck src/go-build-wrapper', shellcheck, args: [go_build_wrapper_file])
-endif
-
 test('go fmt', meson_go_fmt_program, args: [meson.current_source_dir()])
-test('go vet', go, args: ['vet', '-c', '3', './...'], workdir: meson.current_source_dir())
-test('go test', go, args: ['test', '-vet', 'off', './...'], workdir: meson.current_source_dir())
+test(
+  'go vet',
+  go,
+  args: ['vet', '-c', '3', './...'],
+  workdir: meson.current_source_dir(),
+)
+test(
+  'go test',
+  go,
+  args: ['test', '-vet', 'off', './...'],
+  workdir: meson.current_source_dir(),
+)

src/meson.build

@@ -16,8 +16,11 @@
 
 package main
 
+import "C"
+
 import "github.com/containers/toolbox/cmd"
 
+//export main
 func main() {
 	cmd.Execute()
 }