Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix builds --without-usb #2263

Merged
merged 1 commit into from Jan 12, 2024

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Jan 12, 2024

Closes: #2262
Follow-up from #2063 et al

CC @EchterAgo

  • Configured --without-usb (now gets built):
:; ldd drivers/apc_modbus
        linux-vdso.so.1 (0x00007fff21ffa000)
        libsystemd.so.0 => /lib/x86_64-linux-gnu/libsystemd.so.0 (0x00007ff2ecd20000)
        libmodbus.so.5 => /lib/x86_64-linux-gnu/libmodbus.so.5 (0x00007ff2ecd12000)
        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007ff2ecaea000)
        liblzma.so.5 => /lib/x86_64-linux-gnu/liblzma.so.5 (0x00007ff2ecabf000)
        libzstd.so.1 => /lib/x86_64-linux-gnu/libzstd.so.1 (0x00007ff2ec9f0000)
        liblz4.so.1 => /lib/x86_64-linux-gnu/liblz4.so.1 (0x00007ff2ec9ce000)
        libcap.so.2 => /lib/x86_64-linux-gnu/libcap.so.2 (0x00007ff2ec9c3000)
        libgcrypt.so.20 => /lib/x86_64-linux-gnu/libgcrypt.so.20 (0x00007ff2ec885000)
        /lib64/ld-linux-x86-64.so.2 (0x00007ff2ece18000)
        libgpg-error.so.0 => /lib/x86_64-linux-gnu/libgpg-error.so.0 (0x00007ff2ec85f000)
  • Configured by default (detecting libusb and using it):
:; ldd drivers/apc_modbus
        linux-vdso.so.1 (0x00007ffd977d7000)
        libsystemd.so.0 => /lib/x86_64-linux-gnu/libsystemd.so.0 (0x00007f357e5c8000)
        libmodbus.so.5 => /lib/x86_64-linux-gnu/libmodbus.so.5 (0x00007f357e5ba000)
        libusb-1.0.so.0 => /lib/x86_64-linux-gnu/libusb-1.0.so.0 (0x00007f357e59c000)
        libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f357e374000)
        liblzma.so.5 => /lib/x86_64-linux-gnu/liblzma.so.5 (0x00007f357e349000)
        libzstd.so.1 => /lib/x86_64-linux-gnu/libzstd.so.1 (0x00007f357e278000)
        liblz4.so.1 => /lib/x86_64-linux-gnu/liblz4.so.1 (0x00007f357e258000)
        libcap.so.2 => /lib/x86_64-linux-gnu/libcap.so.2 (0x00007f357e24d000)
        libgcrypt.so.20 => /lib/x86_64-linux-gnu/libgcrypt.so.20 (0x00007f357e10f000)
        /lib64/ld-linux-x86-64.so.2 (0x00007f357e6c5000)
        libudev.so.1 => /lib/x86_64-linux-gnu/libudev.so.1 (0x00007f357e0e5000)
        libgpg-error.so.0 => /lib/x86_64-linux-gnu/libgpg-error.so.0 (0x00007f357e0bd000)

@jimklimov jimklimov added bug APC USB CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) modbus impacts-release-2.8.1 Issues reported against NUT release 2.8.1 (maybe vanilla or with minor packaging tweaks) labels Jan 12, 2024
@jimklimov jimklimov added this to the 2.8.2 milestone Jan 12, 2024
@jimklimov jimklimov merged commit 1450567 into networkupstools:master Jan 12, 2024
12 checks passed
@jimklimov jimklimov deleted the issue-build-without-usb branch January 12, 2024 17:06
@EchterAgo
Copy link
Contributor

Looks good to me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
APC bug CI Entries related to continuous integration infrastructure (historically also recipes like Makefiles) impacts-release-2.8.1 Issues reported against NUT release 2.8.1 (maybe vanilla or with minor packaging tweaks) modbus USB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Builds explicitly --without-usb fail (at least on platforms with libusb present)
2 participants