From ac5912e9cb7761b5153bc12343f1af8b224c1d29 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 28 Oct 2021 18:55:26 -0700 Subject: [PATCH] remove a bunch of rpath hacks These are already default. Signed-off-by: Rosen Penev --- libs/czmq/Makefile | 1 - libs/lzo/Makefile | 4 +--- libs/zmq/Makefile | 1 - multimedia/mjpg-streamer/Makefile | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/czmq/Makefile b/libs/czmq/Makefile index 857f0ceea..e6f606d53 100644 --- 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 0e4e678cb..e78a0520a 100644 --- 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 3803544bc..5e80f7234 100644 --- 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 5fc943c87..c43bbe30b 100644 --- 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