[bluez/bluez] 5960da: input: fix HID compilation w/o HoG

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



  Branch: refs/heads/958549
  Home:   https://github.com/bluez/bluez
  Commit: 5960da49b27a976ce8792bad46cceb74b740078b
      https://github.com/bluez/bluez/commit/5960da49b27a976ce8792bad46cceb74b740078b
  Author: Thomas Perale <thomas.perale@xxxxxxx>
  Date:   2025-04-30 (Wed, 30 Apr 2025)

  Changed paths:
    M profiles/input/device.c
    M profiles/input/device.h
    M profiles/input/hog.c

  Log Message:
  -----------
  input: fix HID compilation w/o HoG

Commit [1] introduced a dependency with the HID plugin in the HoG code
As a result, building with --enable-hid --disable-hog caused linker
errors due to undefined references to HoG-related functions:

```
> ./configure --enable-hid --disable-hog
...
> make
...
  CCLD     src/bluetoothd
/usr/bin/ld: profiles/input/bluetoothd-manager.o: in function `input_init':
/home/../bluez/profiles/input/manager.c:122:(.text.input_init+0x1c8): undefined reference to `input_set_auto_sec'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:6376: src/bluetoothd] Error 1
```

This patch moves the `input_set_auto_sec` function to
`profiles/input/device.c` file so it remains defined even when HoG is
disabled.

[1] f2778f587 input: Add LEAutoSecurity setting to input.conf


  Commit: 37aeb6597318bb1befe5bd0b8f561359f27fa0c3
      https://github.com/bluez/bluez/commit/37aeb6597318bb1befe5bd0b8f561359f27fa0c3
  Author: Thomas Perale <thomas.perale@xxxxxxx>
  Date:   2025-04-30 (Wed, 30 Apr 2025)

  Changed paths:
    M configure.ac
    M profiles/input/hog.c

  Log Message:
  -----------
  input: fix HoG compilation w/o HID

Commit [1] introduced a dependency with the HID plugin in the HoG code
As a result, building with --disable-hid --enable-hog caused linker
errors due to undefined references to HID-related functions:

```
> ./configure --disable-hid --enable-hog
> make
/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_accept':
/home/../bluez/profiles/input/hog.c:184:(.text.hog_accept+0xbb): undefined reference to `input_get_auto_sec'
/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect':
/home/../bluez/profiles/input/hog.c:205:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:6344: src/bluetoothd] Error 1
make: *** [Makefile:4695: all] Error 2
```

This patch introduces the HAVE_HID symbol to conditionally call the
HID-related code in the HoG plugin only when HID is enabled.

Additionally, hog_disconnect() reverts to its pre-[1] behavior when
the HID plugin is unavailable.

[1] 1782bfd79 input: Add support for UserspaceHID=persist

Fixes: https://github.com/bluez/bluez/issues/1228


Compare: https://github.com/bluez/bluez/compare/5960da49b27a%5E...37aeb6597318

To unsubscribe from these emails, change your notification settings at https://github.com/bluez/bluez/settings/notifications




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux