cleanup meson / spack

- spack v1.0 (seems spack meson packages don't set rpath correctly)
- fix meson build

Author: simonpintarelli

meson.build

@@ -1,5 +1,5 @@
 project('squashfs-mount', ['c'],
-        default_options : ['c_std=c99', 'default_library=static'],
+        default_options : ['c_std=c99', 'default_library=shared'],
         version: files('VERSION'),
         meson_version: '>=0.57')
 
@@ -13,7 +13,7 @@ version = meson.project_version()
 exec = executable('squashfs-mount',
                   sources: ['squashfs-mount.c', 'utils.c'],
                   dependencies: [dep_libmount],
-                  c_args: ['-DVERSION="@0@"'.format(version)],
+                  c_args: ['-DSQFS_MOUNT_VERSION="@0@"'.format(version)],
                   # equivalent to: `chown root:root $exec; chmod u+s $exec;` before installation.
                   install_mode: ['rwsr-xr-x', 'root', 'root'],
                   install: true)
@@ -22,24 +22,24 @@ if rootless
   default_library = get_option('default_library')
   deps = []
   if default_library == 'static'
-    deps += dependency('squashfuse_ll', static: true)
+    sqfs_ll = dependency('squashfuse_ll', static: true)
+    deps += sqfs_ll
     deps += dependency(get_option('fuse_version'), method: 'pkg-config', static: true)
-    # TODO: this needs to be passed as arguments
     deps += dependency('liblz4', static: true)
     deps += dependency('libzstd', static: true)
     deps += dependency('liblzma', static: true)
     deps += dependency('lzo2', static: true)
     deps += dependency('zlib', static: true)
-
   else
-    deps += dependency('squashfuse_ll', static: false)
+    sqfs_ll = dependency('squashfuse_ll', static: false)
     deps += dependency(get_option('fuse_version'), method: 'pkg-config', static: false)
+    deps += sqfs_ll
   endif
 
   executable('squashfs-mount-rootless',
              sources: ['squashfs-mount-rootless.c', 'rootless.c', 'utils.c'],
              dependencies: deps,
-             c_args: ['-DVERSION="@0@"'.format(version)],
+             c_args: ['-DSQFS_MOUNT_VERSION="@0@"'.format(version)],
              install_mode: [],
              install: true)
 endif

spack/packages/squashfs-mount/package.py

@@ -2,7 +2,6 @@
 #include "rootless.h"
 #include "utils.h"
 #include <err.h>
-#include <errno.h>
 #include <limits.h>
 #include <signal.h>
 #include <squashfuse/ll.h>

spack/repo.yaml

@@ -107,7 +107,7 @@ int main(int argc, char **argv) {
     if (strcmp(arg, "-h") == 0 || strcmp(arg, "--help") == 0)
       help(program);
     if (strcmp(arg, "-v") == 0 || strcmp(arg, "--version") == 0) {
-      puts(VERSION);
+      puts(SQFS_MOUNT_VERSION);
       exit(EXIT_SUCCESS);
     }
     // Error on unrecognized flags.