bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix peeguardian compilation against libipq other programs should also use those libraries instead of the old libipq (#4307)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@13629 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-12-14 17:31:17 +00:00
parent ed9e74add2
commit 623a7e282e
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/peerguardian/Makefile
View File

@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/peerguardian
SECTION:=net
CATEGORY:=Network
DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx
DEPENDS:= +kmod-ipt-queue +libncurses +libpthread +uclibcxx +libnetfilter-queue +libnfnetlink
TITLE:=PeerGuardian for Linux
URL:=http://phoenixlabs.org/
endef
@ -41,7 +41,7 @@ define Package/peerguardian/conffiles
endef
CONFIGURE_VARS+= \
CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti" \
CXXFLAGS="$$$$CXXFLAGS $$$$CPPFLAGS -fno-builtin -fno-rtti -I$(STAGING_DIR)/usr/include/libnetfilter_queue/" \
LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm -lgcc" \
define Build/Compile

24
net/peerguardian/patches/002-new_libipq.patch Normal file
View File

@ -0,0 +1,24 @@
diff -urN pglinux-1.5beta/Makefile.am pglinux-1.5beta.new/Makefile.am
--- pglinux-1.5beta/Makefile.am 2005-04-02 07:39:56.000000000 +0200
+++ pglinux-1.5beta.new/Makefile.am 2008-12-14 18:25:45.000000000 +0100
@@ -3,7 +3,7 @@
mybin_PROGRAMS = peerguardnf pgtext
peerguardnf_SOURCES=Main.cpp PeerGuard.cpp BlockList.cpp Blocker_Linux.cpp Blocker_BSD.cpp HttpServer.cpp HttpRequest.cpp sha1.cpp
pgtext_SOURCES=pgtext.cpp
-peerguardnf_LDADD=-lipq -lpthread
+peerguardnf_LDADD=-lnetfilter_queue_libipq -lnetfilter_queue -lnfnetlink -lpthread
pgtext_LDADD=-lncurses -lpthread
peerguardnf_LDFLAGS=$(all_includes) -I/usr/include/libipq
AM_CPPFLAGS=$(ALL_INCLUDES) -I/usr/include/libipq
diff -urN pglinux-1.5beta/Makefile.in pglinux-1.5beta.new/Makefile.in
--- pglinux-1.5beta/Makefile.in 2005-03-31 09:40:29.000000000 +0200
+++ pglinux-1.5beta.new/Makefile.in 2008-12-14 18:25:25.000000000 +0100
@@ -72,7 +72,7 @@
mybin_PROGRAMS = peerguardnf pgtext
peerguardnf_SOURCES = Main.cpp PeerGuard.cpp BlockList.cpp Blocker_Linux.cpp Blocker_BSD.cpp HttpServer.cpp HttpRequest.cpp sha1.cpp
pgtext_SOURCES = pgtext.cpp
-peerguardnf_LDADD = -lipq -lpthread
+peerguardnf_LDADD = -lnetfilter_queue_libipq -lnetfilter_queue -lnfnetlink -lpthread
pgtext_LDADD = -lncurses -lpthread
peerguardnf_LDFLAGS = $(all_includes) -I/usr/include/libipq
AM_CPPFLAGS = $(ALL_INCLUDES) -I/usr/include/libipq