X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2b02642832677bd2d7d089aaebedf36b897e7ac0..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/libpcap/patches/100-shared-lib.patch diff --git a/package/libpcap/patches/100-shared-lib.patch b/package/libpcap/patches/100-shared-lib.patch index 54cc774a3..aae77f8e7 100644 --- a/package/libpcap/patches/100-shared-lib.patch +++ b/package/libpcap/patches/100-shared-lib.patch @@ -1,13 +1,12 @@ -diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in ---- libpcap-0.9.4.orig/Makefile.in 2003-12-15 02:35:03.000000000 +0100 -+++ libpcap-0.9.4/Makefile.in 2006-02-05 16:56:18.000000000 +0100 +--- a/Makefile.in ++++ b/Makefile.in @@ -37,6 +37,15 @@ srcdir = @srcdir@ VPATH = @srcdir@ +# some defines for shared library compilation +MAJ=0.9 -+MIN=4 ++MIN=8 +VERSION=$(MAJ).$(MIN) +LIBNAME=pcap +LIBRARY=lib$(LIBNAME).a @@ -17,7 +16,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in # # You shouldn't need to edit anything below. # -@@ -50,6 +59,7 @@ +@@ -52,6 +61,7 @@ # Standard CFLAGS CFLAGS = $(CCOPT) $(INCLS) $(DEFS) @@ -25,7 +24,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -70,7 +80,12 @@ +@@ -72,7 +82,12 @@ .c.o: @rm -f $@ $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -38,7 +37,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in PSRC = pcap-@V_PCAP@.c FSRC = fad-@V_FINDALLDEVS@.c SSRC = @SSRC@ -@@ -84,6 +99,7 @@ +@@ -86,6 +101,7 @@ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) @@ -46,7 +45,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ ethertype.h gencode.h gnuc.h GENHDR = \ -@@ -95,15 +111,23 @@ +@@ -97,15 +113,23 @@ TAGFILES = \ $(SRC) $(HDR) $(TAGHDR) @@ -72,7 +71,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in shared: libpcap.$(DYEXT) # -@@ -129,6 +153,10 @@ +@@ -131,6 +155,10 @@ scanner.o: scanner.c tokdefs.h $(CC) $(CFLAGS) -c scanner.c @@ -83,7 +82,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in pcap.o: version.h tokdefs.h: grammar.c -@@ -142,9 +170,16 @@ +@@ -144,9 +172,16 @@ @rm -f $@ $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c @@ -100,7 +99,7 @@ diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in snprintf.o: $(srcdir)/missing/snprintf.c $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c -@@ -170,10 +205,17 @@ +@@ -172,10 +207,17 @@ bpf_filter.o: bpf_filter.c $(CC) $(CFLAGS) -c bpf_filter.c