remove a bunch of rpath hacks

These are already default.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile
index 857f0ceeacc11b704e006f0af2d68dce6e712bc3..e6f606d53c868632a0b878d4d3f2333f8a709906 100644 (file)
--- a/libs/czmq/Makefile
+++ b/libs/czmq/Makefile
@@ -41,7 +41,6 @@ endef
 CMAKE_OPTIONS += \
        -DBUILD_TESTING=OFF \
        -DCMAKECONFIG_INSTALL_DIR=lib/cmake/czmq \
-       -DCMAKE_SKIP_INSTALL_RPATH=ON \
        -DENABLE_DRAFTS=OFF
 
 define Package/czmq/install

diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile
index 0e4e678cbb942e5a8ba51737f2a269eb9c3c5f8b..e78a0520a2787e791c9cd515e974647ae1560571 100644 (file)
--- a/libs/lzo/Makefile
+++ b/libs/lzo/Makefile
@@ -39,9 +39,7 @@ endef
 CMAKE_OPTIONS += \
        -DENABLE_SHARED=ON \
        -DENABLE_STATIC=ON \
-       \
-       -DBUILD_TESTING=OFF \
-       -DCMAKE_SKIP_INSTALL_RPATH=ON
+       -DBUILD_TESTING=OFF
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig

diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile
index 3803544bcf3a1c91bea3f92c298b52ef3260c34f..5e80f72340cbe374768640621b2920e4ec663f2e 100644 (file)
--- a/libs/zmq/Makefile
+++ b/libs/zmq/Makefile
@@ -77,7 +77,6 @@ CMAKE_OPTIONS += \
        -DA2X_EXECUTABLE=OFF \
        -DASCIIDOC_EXECUTABLE=OFF \
        -DBUILD_STATIC=OFF \
-       -DCMAKE_SKIP_INSTALL_RPATH=ON \
        -DZMQ_HAVE_SOCK_CLOEXEC=ON \
        -DZMQ_HAVE_SO_KEEPALIVE=ON \
        -DZMQ_HAVE_TCP_KEEPCNT=ON \

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 5fc943c872bf54a15441c57f425bc476c4218770..c43bbe30b9f2e190e14b89cab3fcfe0201a67f3d 100644 (file)
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -175,8 +175,6 @@ $(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