KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libpcap: add -fpic, refresh patches

Browse source 
SVN-Revision: 26999
This commit is contained in:
Jo-Philipp Wich 2011-05-24 10:36:25 +00:00
parent 50d2a84a21
commit f94411e910
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/libpcap/Makefile
View file

@ -38,6 +38,7 @@ define Package/libpcap/config
endef endef
TARGET_CFLAGS += \ TARGET_CFLAGS += \
$(FPIC) \
-ffunction-sections \ -ffunction-sections \
-fdata-sections -fdata-sections

2
package/libpcap/patches/102-makefile_disable_manpages.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -539,62 +539,12 @@ install: install-shared install-archive @@ -539,62 +539,12 @@ install: install-shared install-archive
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
[ -d $(DESTDIR)$(includedir)/pcap ] || \ [ -d $(DESTDIR)$(includedir)/pcap ] || \
(mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap) (mkdir -p $(DESTDIR)$(includedir)/pcap; chmod 755 $(DESTDIR)$(includedir)/pcap)

6
package/libpcap/patches/201-space_optimization.patch
View file

@ -1,6 +1,6 @@
--- a/gencode.c --- a/gencode.c
+++ b/gencode.c +++ b/gencode.c
@@ -439,20 +439,6 @@ pcap_compile_nopcap(int snaplen_arg, int @@ -491,20 +491,6 @@ pcap_compile_nopcap(int snaplen_arg, int
} }
/* /*
@ -23,7 +23,7 @@
* back to another unresolved block (or nil). At least one of the fields * back to another unresolved block (or nil). At least one of the fields
--- a/pcap.c --- a/pcap.c
+++ b/pcap.c +++ b/pcap.c
@@ -698,6 +698,59 @@ static const u_char charmap[] = { @@ -748,6 +748,59 @@ static const u_char charmap[] = {
(u_char)'\374', (u_char)'\375', (u_char)'\376', (u_char)'\377', (u_char)'\374', (u_char)'\375', (u_char)'\376', (u_char)'\377',
}; };
@ -85,7 +85,7 @@
{ {
--- a/optimize.c --- a/optimize.c
+++ b/optimize.c +++ b/optimize.c
@@ -2278,45 +2278,6 @@ icode_to_fcode(root, lenp) @@ -2292,45 +2292,6 @@ icode_to_fcode(root, lenp)
return fp; return fp;
} }

8
package/libpcap/patches/202-protocol_api.patch
View file

@ -105,11 +105,10 @@
return (p); return (p);
} }
@@ -317,6 +319,15 @@ pcap_set_buffer_size(pcap_t *p, int buff @@ -318,6 +320,15 @@ pcap_set_buffer_size(pcap_t *p, int buff
return 0;
} }
+int int
+pcap_set_protocol(pcap_t *p, unsigned short proto) +pcap_set_protocol(pcap_t *p, unsigned short proto)
+{ +{
+ if (pcap_check_activated(p)) + if (pcap_check_activated(p))
@ -118,9 +117,10 @@
+ return 0; + return 0;
+} +}
+ +
int +int
pcap_activate(pcap_t *p) pcap_activate(pcap_t *p)
{ {
int status;
--- a/pcap/pcap.h --- a/pcap/pcap.h
+++ b/pcap/pcap.h +++ b/pcap/pcap.h
@@ -68,6 +68,7 @@ extern "C" { @@ -68,6 +68,7 @@ extern "C" {