From 225aaa122a49275f07e1a3de97d7d4a1b15138cc Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sat, 6 Nov 2021 17:35:51 +0100 Subject: [PATCH] mjpg-streamer: fix missing runpath This partially reverts ac5912e9cb7761b5153bc12343f1af8b224c1d29. CMAKE_SKIP_RPATH=TRUE is set in include/cmake.mk, so the commit removed this from some packages as it is the default anyway. But in mjpg-streamer Makefile this was not set to "TRUE", but to "FALSE". So this line shouldn't have been removed. With this revert the runpath is back and modules can be loaded again from "/usr/lib/mjpg-streamer": readelf -d build_dir/target-mips_24kc_musl/mjpg-streamer-1.0.0/ipkg-mips_24kc/mjpg-streamer/usr/bin/mjpg_streamer Dynamic section at offset 0x1c0 contains 35 entries: Tag Type Name/Value 0x00000001 (NEEDED) Shared library: [libjpeg.so.62] 0x00000001 (NEEDED) Shared library: [libgcc_s.so.1] 0x00000001 (NEEDED) Shared library: [libc.so] 0x0000001d (RUNPATH) Library runpath: [/usr/lib/mjpg-streamer] Resolve #17081 Signed-off-by: Sebastian Kemper --- multimedia/mjpg-streamer/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index c43bbe30..5fc943c8 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -175,6 +175,8 @@ $(call Package/mjpg-streamer/Default/description) This package provides simple version of the web content. endef +CMAKE_OPTIONS += -DCMAKE_SKIP_RPATH=FALSE + CAMBOZOLA:=cambozola-0.936.tar.gz # Distribution URL doesn't always have the correct version