From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 9 Mar 2015 22:07:05 +0000 (+0000)
Subject: ebtables: revert "disable rpath" (closes: #19088)
X-Git-Tag: reboot~4096
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a7f198b12cdafaa515a59d323d627893b4337e16;p=openwrt%2Fstaging%2Fjogo.git

ebtables: revert "disable rpath" (closes: #19088)

This reverts commit 9340723d70bce9d905c3f53b2bf415963153b34d.

Signed-off-by: Nicolas Thill <nico@openwrt.org>

SVN-Revision: 44634
---

diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile
index 214e247e74..4f6d7f5323 100644
--- a/package/network/utils/ebtables/Makefile
+++ b/package/network/utils/ebtables/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
 PKG_VERSION:=2.0.10-4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
diff --git a/package/network/utils/ebtables/patches/001-no_rpath.patch b/package/network/utils/ebtables/patches/001-no_rpath.patch
deleted file mode 100644
index d4c13f620b..0000000000
--- a/package/network/utils/ebtables/patches/001-no_rpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -90,8 +90,7 @@ libebtc.so: $(OBJECTS2)
- 	$(CC) -shared $(LDFLAGS) -Wl,-soname,libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc.so
--	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
--	-Wl,-rpath,$(LIBDIR)
-+	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) $(LDFLAGS) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI)
- 
- ebtablesu: ebtablesu.c
- 	$(CC) $(CFLAGS) $(PROGSPECSD) $< -o $@
-@@ -100,15 +99,13 @@ ebtablesd.o: ebtablesd.c include/ebtable
- 	$(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtablesd: $(OBJECTS) ebtablesd.o libebtc.so
--	$(CC) $(CFLAGS) -o $@ ebtablesd.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
--	-Wl,-rpath,$(LIBDIR)
-+	$(CC) $(CFLAGS) -o $@ ebtablesd.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI)
- 
- ebtables-restore.o: ebtables-restore.c include/ebtables_u.h
- 	$(CC) $(CFLAGS) $(PROGSPECS) -c $< -o $@  -I$(KERNEL_INCLUDES)
- 
- ebtables-restore: $(OBJECTS) ebtables-restore.o libebtc.so
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
--	-Wl,-rpath,$(LIBDIR)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ebtables-restore.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI)
- 
- .PHONY: daemon
- daemon: ebtablesd ebtablesu