Linux: use new jextract option for libudev

manuelbl · Feb 20, 2024 · 0326bb9 · 0326bb9
1 parent 7c8eeee
commit 0326bb9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 14 deletions.
diff --git a/java-does-usb/jextract/README.md b/java-does-usb/jextract/README.md
@@ -43,17 +43,6 @@ On Linux, the limitations are:
 
 - `sd-device.h` (header file for *libsystemd*): *jextract* fails with *"Error: /usr/include/inttypes.h:290:8: error: unknown type name 'intmax_t'"*. The reason is yet unknown. This code is currently not needed as *libudev* is used instead of *libsystemd*. They are related, *libsystemd* is the future solution, but it is missing support for monitoring devices.
 
-- `libudev.h`: After code generation, the class `udev` in `.../linux/gen/udev` must be manually modified. In most Linux installations, there is no `libudev.so` alias to an actual version like `libudev.so.1.7.2`. The only alias is `libudev.so.1`. This is probably a deliberate decision by the authors as they do not plan to provide backward compatibility across major versions. But there does not seem to be a way to make *jextract* generate valid code for this setup. So manually replace:
-
-```
-static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup(System.mapLibraryName("udev"), LIBRARY_ARENA)
-```
-
-with:
-
-```
-static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup("libudev.so.1", LIBRARY_ARENA)
-```
 
 
 ## MacOS

diff --git a/java-does-usb/jextract/linux/gen_linux.sh b/java-does-usb/jextract/linux/gen_linux.sh
@@ -61,7 +61,7 @@ $JEXTRACT --output ../../src/main/java \
 $JEXTRACT --output ../../src/main/java \
   --header-class-name udev \
   --target-package net.codecrete.usb.linux.gen.udev \
-  -l udev \
+  -l :libudev.so.1 \
   --include-function udev_new \
   --include-function udev_enumerate_new \
   --include-function udev_enumerate_add_match_subsystem \

diff --git a/java-does-usb/src/main/java/net/codecrete/usb/linux/gen/udev/udev.java b/java-does-usb/src/main/java/net/codecrete/usb/linux/gen/udev/udev.java
@@ -64,8 +64,6 @@ static MemoryLayout align(MemoryLayout layout, long align) {
         };
     }
 
-    // Manually fix. Otherwise, libudev will not be found if "libudev-dev" is not installed
-    // static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup(System.mapLibraryName("udev"), LIBRARY_ARENA)
     static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup("libudev.so.1", LIBRARY_ARENA)
             .or(SymbolLookup.loaderLookup())
             .or(Linker.nativeLinker().defaultLookup());