Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove a bunch of rpath hacks

Browse source 
These are already default.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-10-28 18:55:26 -07:00
parent a1f1303ae3
commit ac5912e9cb
4 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/czmq/Makefile
View file

@ -41,7 +41,6 @@ endef
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DBUILD_TESTING=OFF \ -DBUILD_TESTING=OFF \
-DCMAKECONFIG_INSTALL_DIR=lib/cmake/czmq \ -DCMAKECONFIG_INSTALL_DIR=lib/cmake/czmq \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DENABLE_DRAFTS=OFF -DENABLE_DRAFTS=OFF
define Package/czmq/install define Package/czmq/install

4
libs/lzo/Makefile
View file

@ -39,9 +39,7 @@ endef
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DENABLE_SHARED=ON \ -DENABLE_SHARED=ON \
-DENABLE_STATIC=ON \ -DENABLE_STATIC=ON \
\ -DBUILD_TESTING=OFF
-DBUILD_TESTING=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=ON
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig

1
libs/zmq/Makefile
View file

@ -77,7 +77,6 @@ CMAKE_OPTIONS += \
-DA2X_EXECUTABLE=OFF \ -DA2X_EXECUTABLE=OFF \
-DASCIIDOC_EXECUTABLE=OFF \ -DASCIIDOC_EXECUTABLE=OFF \
-DBUILD_STATIC=OFF \ -DBUILD_STATIC=OFF \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DZMQ_HAVE_SOCK_CLOEXEC=ON \ -DZMQ_HAVE_SOCK_CLOEXEC=ON \
-DZMQ_HAVE_SO_KEEPALIVE=ON \ -DZMQ_HAVE_SO_KEEPALIVE=ON \
-DZMQ_HAVE_TCP_KEEPCNT=ON \ -DZMQ_HAVE_TCP_KEEPCNT=ON \

2
multimedia/mjpg-streamer/Makefile
View file

@ -175,8 +175,6 @@ $(call Package/mjpg-streamer/Default/description)
This package provides simple version of the web content. This package provides simple version of the web content.
endef endef
CMAKE_OPTIONS += -DCMAKE_SKIP_RPATH=FALSE
CAMBOZOLA:=cambozola-0.936.tar.gz CAMBOZOLA:=cambozola-0.936.tar.gz
# Distribution URL doesn't always have the correct version # Distribution URL doesn't always have the correct version