openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-01 22:41:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #597 from 1582130940/rpath

Browse Source 
treewide: remove rpath-link
This commit is contained in:
Beginner 2022-11-17 11:56:46 +08:00 committed by GitHub
commit f4b468028f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 10 additions and 31 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/libcups/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cups PKG_NAME:=cups
PKG_VERSION:=2.2.12 PKG_VERSION:=2.2.12
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.gz
PKG_SOURCE_URL:=https://github.com/apple/cups/releases/download/v$(PKG_VERSION)/ PKG_SOURCE_URL:=https://github.com/apple/cups/releases/download/v$(PKG_VERSION)/
@ -40,8 +40,6 @@ define Package/libcups/description
Common UNIX Printing System - Core library Common UNIX Printing System - Core library
endef endef
TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
CONFIGURE_ARGS+=--with-cups-user="nobody" \ CONFIGURE_ARGS+=--with-cups-user="nobody" \
--with-cups-group="nogroup" \ --with-cups-group="nogroup" \
--with-components="core" \ --with-components="core" \

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 \

4
multimedia/fswebcam/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fswebcam PKG_NAME:=fswebcam
PKG_VERSION:=20140113 PKG_VERSION:=20140113
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.firestorm.cx/fswebcam/files \ PKG_SOURCE_URL:=http://www.firestorm.cx/fswebcam/files \
@ -40,7 +40,7 @@ define Package/fswebcam/description
endef endef
EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
define Package/fswebcam/install define Package/fswebcam/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin

2
net/strongswan/Makefile
View File

@ -478,8 +478,6 @@ CONFIGURE_ARGS+= \
) \ ) \
ac_cv_search___atomic_load=no ac_cv_search___atomic_load=no
EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
define Package/strongswan/conffiles define Package/strongswan/conffiles
/etc/strongswan.conf /etc/strongswan.conf
/etc/strongswan.d/ /etc/strongswan.d/

4
net/vnstat/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vnstat PKG_NAME:=vnstat
PKG_VERSION:=1.18 PKG_VERSION:=1.18
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://humdi.net/vnstat PKG_SOURCE_URL:=http://humdi.net/vnstat
@ -71,7 +71,7 @@ define Build/Compile/vnstati
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \ LDFLAGS="$(TARGET_LDFLAGS)" \
all all
endef endef

1
sound/owntone/Makefile
View File

@ -58,7 +58,6 @@ CONFIGURE_ARGS += \
--without-libevent_pthreads --without-libevent_pthreads
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
define Package/owntone/install define Package/owntone/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin

4
sound/sox/Makefile
View File

@ -17,14 +17,10 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE:=LGPL-2.1 GPL-2.0
PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL PKG_LICENSE_FILES:=COPYING LICENSE.LGPL LICENSE.GPL
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/sox define Package/sox
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound

2
utils/bandwidthd/Makefile
View File

@ -139,7 +139,7 @@ CONFIGURE_ARGS += \
endif endif
EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) -fgnu89-inline EXTRA_CFLAGS+= $(TARGET_CPPFLAGS) -fgnu89-inline
EXTRA_LDFLAGS+= $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
define Package/bandwidthd/install define Package/bandwidthd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin

11
utils/mbtools/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mbtools PKG_NAME:=mbtools
PKG_SOURCE_DATE:=2014-10-29 PKG_SOURCE_DATE:=2014-10-29
PKG_SOURCE_VERSION:=149e9c69cec180f18cf8781cf5285b97352bf719 PKG_SOURCE_VERSION:=149e9c69cec180f18cf8781cf5285b97352bf719
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/webstack/mbtools PKG_SOURCE_URL:=https://github.com/webstack/mbtools
@ -31,7 +31,7 @@ define Package/mbtools
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Modbus tools TITLE:=Modbus tools
DEPENDS:=+glib2 +libmodbus $(INTL_DEPENDS) DEPENDS:=+glib2 +libmodbus
endef endef
define Package/mbtools/description define Package/mbtools/description
@ -40,13 +40,6 @@ define Package/mbtools/description
as client or server (in TCP or RTU) as client or server (in TCP or RTU)
endef endef
ifneq ($(INTL_FULL),)
TARGET_LDFLAGS += \
-L$(INTL_PREFIX)/lib \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
endif
define Package/mbtools/install define Package/mbtools/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbrecorder $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbrecorder $(1)/usr/bin/

3
utils/owfs/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=owfs PKG_NAME:=owfs
PKG_VERSION:=3.2p4 PKG_VERSION:=3.2p4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/owfs/owfs/releases/download/v$(PKG_VERSION)
@ -201,7 +201,6 @@ CONFIGURE_ARGS += \
$(if $(CONFIG_LIBOW_OWTRAFFIC),--enable-owtraffic,--disable-owtraffic) $(if $(CONFIG_LIBOW_OWTRAFFIC),--enable-owtraffic,--disable-owtraffic)
CONFIGURE_VARS += \ CONFIGURE_VARS += \
LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(TOOLCHAIN_DIR)/usr/lib" \
lt_cv_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ lt_cv_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
shrext_cmds=".so" \ shrext_cmds=".so" \