Skip to content

Commit a4d2e44

Browse files
Release: Avoid dependency on libudev in OpenOCD
After commit "904e203 Release: Build libusb for Linux builds as well" libusb was built locally for OpenOCD for Linux instead of using libusb from system packages. This introduced dependency on libudev.so.0 present in RHEL/CentOS 6 systems, but absent in RHEL/CentOS 7, which has libudev.so.1. To avoid this dependency libusb should be built without udev support. Signed-off-by: Anton Kolesov <[email protected]>
1 parent 9921b5b commit a4d2e44

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

release.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -821,11 +821,15 @@ $(BUILD_DIR)/libusb_linux_src: $(BUILD_DIR)/libusb-$(LIBUSB_VERSION).tar.bz2
821821
tar -C $(BUILD_DIR) -xf $< --transform='s/libusb-$(LIBUSB_VERSION)/libusb_linux_src/'
822822

823823

824+
# udev should be disabled, to avoid dependency on libudev.so, because various
825+
# distributions might have different versions (CentOS 6 uses libudev.so.0,
826+
# while CentOS 7 uses libudev.so.1).
824827
.PHONY: libusb-linux-install
825828
libusb-linux-install: $(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a
826829
$(BUILD_DIR)/libusb_linux_install/lib/libusb-1.0.a: $(BUILD_DIR)/libusb_linux_src
827830
cd $< && \
828831
./configure --disable-shared --enable-static \
832+
--disable-udev \
829833
--prefix=$(abspath $(BUILD_DIR)/libusb_linux_install)
830834
$(MAKE) -C $< -j1
831835
$(MAKE) -C $< install

0 commit comments

Comments
 (0)