[test]

Author: kwvg

.github/workflows/build-meson.yml

@@ -55,8 +55,8 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: |
-            $HOME/.cargo/registry
-            $HOME/.cargo/git
+            /home/runner/.cargo/registry
+            /home/runner/.cargo/git
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-
@@ -73,16 +73,16 @@ jobs:
       - name: Build libgrovedb
         run: |
           cd src/ffi/grovedb
-          meson setup builddir --wipe -Duse_rustdeps=true -Drustdeps_build_dir=${{ github.workspace }}/rust/builddir
+          meson setup builddir -Duse_rustdeps=true -Drustdeps_build_dir=${{ github.workspace }}/rust/builddir
           meson compile -C builddir
 
       - name: Save Cargo cache
         if: github.event_name == 'push' && github.ref_name == 'develop'
         uses: actions/cache/save@v4
         with:
           path: |
-            $HOME/.cargo/registry
-            $HOME/.cargo/git
+            /home/runner/.cargo/registry
+            /home/runner/.cargo/git
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
 
   build-grovedb-cxx:
@@ -117,8 +117,8 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: |
-            $HOME/.cargo/registry
-            $HOME/.cargo/git
+            /home/runner/.cargo/registry
+            /home/runner/.cargo/git
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}
           restore-keys: |
             ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-
@@ -135,12 +135,8 @@ jobs:
       - name: Build libgrovedb
         run: |
           cd src/ffi/grovedb
-          # Verify library exists
-          ls -la ${{ github.workspace }}/rust/grovedb_cxx/builddir/libgrovedb_cxx.a
-          meson setup builddir --wipe -Dgrovedb_cxx_build_dir=${{ github.workspace }}/rust/grovedb_cxx/builddir
+          meson setup builddir -Dgrovedb_cxx_build_dir=${{ github.workspace }}/rust/grovedb_cxx/builddir
           meson compile -C builddir
-          # Check symbols in shared library
-          nm -D builddir/libgrovedb.so.1 | grep whoami || echo "whoami symbol not found in shared library"
 
       - name: Run tests
         run: |
@@ -152,6 +148,6 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: |
-            $HOME/.cargo/registry
-            $HOME/.cargo/git
+            /home/runner/.cargo/registry
+            /home/runner/.cargo/git
           key: ${{ runner.os }}-cargo-${{ env.RUST_VERSION }}-${{ hashFiles('Cargo.lock') }}

src/ffi/grovedb/meson.build

@@ -57,10 +57,9 @@ if use_rustdeps
   grovedb_cxx_bridge_header = grovedb_cxx_subdir / 'gen' / 'rust' / 'grovedb_cxx' / 'lib.h'
 
   # Find the Rust library (libgrovedb_cxx.a is in subprojects/grovedb_cxx/ subdirectory)
-  grovedb_cxx_lib_path = grovedb_cxx_subdir / 'libgrovedb_cxx.a'
-  # Only compile args here - linking handled separately via whole-archive
-  grovedb_cxx_compile_dep = declare_dependency(
+  grovedb_cxx_lib = declare_dependency(
     compile_args: ['-I' + grovedb_cxx_include],
+    dependencies: cxx.find_library('grovedb_cxx', dirs: [grovedb_cxx_subdir]),
   )
 
   cxx_bridge_lib = static_library('cxxbridge_grovedb',
@@ -80,10 +79,9 @@ elif grovedb_cxx_build_dir != ''
     error('CXX bridge source not found at: ' + grovedb_cxx_bridge_source)
   endif
 
-  grovedb_cxx_lib_path = grovedb_cxx_build_dir / 'libgrovedb_cxx.a'
-  # Only compile args here - linking handled separately via whole-archive
-  grovedb_cxx_compile_dep = declare_dependency(
+  grovedb_cxx_lib = declare_dependency(
     compile_args: ['-I' + grovedb_cxx_include],
+    dependencies: cxx.find_library('grovedb_cxx', dirs: [grovedb_cxx_build_dir]),
   )
 
   cxx_bridge_lib = static_library('cxxbridge_grovedb',
@@ -119,10 +117,9 @@ else
             'Please build grovedb_cxx first (see above)')
     endif
 
-    grovedb_cxx_lib_path = rust_build_dir / 'grovedb_cxx' / 'libgrovedb_cxx.a'
-    # Only compile args here - linking handled separately via whole-archive
-    grovedb_cxx_compile_dep = declare_dependency(
+    grovedb_cxx_lib = declare_dependency(
       compile_args: ['-I' + grovedb_cxx_include],
+      dependencies: cxx.find_library('grovedb_cxx', dirs: [rust_build_dir / 'grovedb_cxx']),
     )
 
     # Compile the CXX bridge source
@@ -151,20 +148,12 @@ libgrovedb_headers = files(
 # Include directories
 libgrovedb_inc = include_directories('include', 'src')
 
-# Platform-specific whole-archive flags to include all Rust symbols
-if host_machine.system() == 'darwin'
-  whole_archive_args = ['-Wl,-force_load,' + grovedb_cxx_lib_path]
-else
-  whole_archive_args = ['-Wl,--whole-archive', grovedb_cxx_lib_path, '-Wl,--no-whole-archive']
-endif
-
 # Build shared library
 libgrovedb_shared = shared_library('grovedb',
   libgrovedb_sources,
   include_directories: libgrovedb_inc,
-  dependencies: [grovedb_cxx_compile_dep, thread_dep],
+  dependencies: [grovedb_cxx_lib, thread_dep],
   link_with: cxx_bridge_lib,
-  link_args: whole_archive_args,
   install: true,
   version: meson.project_version(),
   soversion: '1',
@@ -174,7 +163,7 @@ libgrovedb_shared = shared_library('grovedb',
 libgrovedb_static = static_library('grovedb',
   libgrovedb_sources,
   include_directories: libgrovedb_inc,
-  dependencies: [grovedb_cxx_compile_dep, thread_dep],
+  dependencies: [grovedb_cxx_lib, thread_dep],
   link_with: cxx_bridge_lib,
   install: true,
 )
@@ -186,7 +175,7 @@ install_headers(libgrovedb_headers, subdir: 'grovedb')
 libgrovedb_dep = declare_dependency(
   include_directories: libgrovedb_inc,
   link_with: libgrovedb_shared,
-  dependencies: [grovedb_cxx_compile_dep, thread_dep],
+  dependencies: [grovedb_cxx_lib, thread_dep],
 )
 
 # pkg-config file