From 7393effbe64edff8346c3fe76d5eea72f54c58c6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 11 Jul 2005 10:12:38 +0000 Subject: libpcap: remove version 0.8.1 and fix do_stage for 0.8.3 --- packages/libpcap/libpcap-0.8.1/.mtn2git_empty | 0 packages/libpcap/libpcap-0.8.1/configure.patch | 22 ----- packages/libpcap/libpcap-0.8.1/shared.patch | 118 ------------------------- packages/libpcap/libpcap_0.8.1.bb | 29 ------ packages/libpcap/libpcap_0.8.3.bb | 6 +- 5 files changed, 3 insertions(+), 172 deletions(-) delete mode 100644 packages/libpcap/libpcap-0.8.1/.mtn2git_empty delete mode 100644 packages/libpcap/libpcap-0.8.1/configure.patch delete mode 100644 packages/libpcap/libpcap-0.8.1/shared.patch delete mode 100644 packages/libpcap/libpcap_0.8.1.bb diff --git a/packages/libpcap/libpcap-0.8.1/.mtn2git_empty b/packages/libpcap/libpcap-0.8.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libpcap/libpcap-0.8.1/configure.patch b/packages/libpcap/libpcap-0.8.1/configure.patch deleted file mode 100644 index e3d9ea34f0..0000000000 --- a/packages/libpcap/libpcap-0.8.1/configure.patch +++ /dev/null @@ -1,22 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.8.1/configure.in~configure -+++ libpcap-0.8.1/configure.in -@@ -32,13 +32,11 @@ - AC_CHECK_FUNCS(ether_hostton strerror strlcpy) - - needsnprintf=no --LIBOBJS= - AC_CHECK_FUNCS(vsnprintf snprintf,, - [needsnprintf=yes]) - if test $needsnprintf = yes; then -- LIBOBJS="$LIBOBJS snprintf.o" -+ AC_LIBOBJ([snprintf]) - fi --AC_SUBST(LIBOBJS) - - dnl to pacify those who hate protochain insn - AC_MSG_CHECKING(if --disable-protochain option is specified) diff --git a/packages/libpcap/libpcap-0.8.1/shared.patch b/packages/libpcap/libpcap-0.8.1/shared.patch deleted file mode 100644 index ef9a291734..0000000000 --- a/packages/libpcap/libpcap-0.8.1/shared.patch +++ /dev/null @@ -1,118 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- libpcap-0.8.1/Makefile.in~shared 2003-12-15 02:42:23.000000000 +0100 -+++ libpcap-0.8.1/Makefile.in 2004-01-02 14:46:18.000000000 +0100 -@@ -37,6 +37,15 @@ - srcdir = @srcdir@ - VPATH = @srcdir@ - -+# some defines for shared library compilation - FIXME, if not matching -+MAJ=0.8 -+MIN=1 -+VERSION=$(MAJ).$(MIN) -+LIBNAME=pcap -+LIBRARY=lib$(LIBNAME).a -+SOLIBRARY=lib$(LIBNAME).so -+SHAREDLIB=$(SOLIBRARY).$(VERSION) -+ - # - # You shouldn't need to edit anything below. - # -@@ -49,6 +58,7 @@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) -+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -69,6 +79,9 @@ - .c.o: - @rm -f $@ - $(CC) $(CFLAGS) -c $(srcdir)/$*.c -+%_pic.o: %.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c - - PSRC = pcap-@V_PCAP@.c - FSRC = fad-@V_FINDALLDEVS@.c -@@ -83,6 +96,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) -+OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=.o) $(CSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) - HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ - ethertype.h gencode.h gnuc.h - GENHDR = \ -@@ -94,15 +108,22 @@ - TAGFILES = \ - $(SRC) $(HDR) $(TAGHDR) - --CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -+CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so* - --all: libpcap.a -+all: libpcap.a $(SHAREDLIB) - - libpcap.a: $(OBJ) - @rm -f $@ - ar rc $@ $(OBJ) $(LIBS) - $(RANLIB) $@ - -+$(SHAREDLIB): $(OBJ_PIC) -+ -@rm -f $@ -+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ) -+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc -+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ) -+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY) -+ - scanner.c: $(srcdir)/scanner.l - @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -110,6 +131,9 @@ - scanner.o: scanner.c tokdefs.h - $(CC) $(CFLAGS) -c scanner.c - -+scanner_pic.o: scanner.c tokdefs.h -+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c -+ - pcap.o: version.h - - tokdefs.h: grammar.c -@@ -123,9 +147,16 @@ - @rm -f $@ - $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c - -+grammer_pic.o: grammar.c -+ @rm -f $@ -+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c -+ - version.o: version.c - $(CC) $(CFLAGS) -c version.c - -+version_pic.o: version.c -+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@ -+ - snprintf.o: $(srcdir)/missing/snprintf.c - $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c - -@@ -151,10 +182,16 @@ - bpf_filter.o: bpf_filter.c - $(CC) $(CFLAGS) -c bpf_filter.c - -+bpf_filter_pic.o: bpf_filter.c -+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@ -+ - install: - [ -d $(DESTDIR)$(libdir) ] || \ - (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) - $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a -+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/ -+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ) -+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY) - $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a - [ -d $(DESTDIR)$(includedir) ] || \ - (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir)) diff --git a/packages/libpcap/libpcap_0.8.1.bb b/packages/libpcap/libpcap_0.8.1.bb deleted file mode 100644 index 42dea21182..0000000000 --- a/packages/libpcap/libpcap_0.8.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Network Packet Capture Library" -SECTION = "libs" -PRIORITY = "required" - -SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \ - file://shared.patch;patch=1 \ - file://configure.patch;patch=1" - -inherit autotools -LICENSE = "BSD" -EXTRA_OECONF = "--with-pcap=linux" -CPPFLAGS_prepend = "-I${S} " -CFLAGS_prepend = "-I${S} " -CXXFLAGS_prepend = "-I${S} " - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -do_stage () { - install -d ${STAGING_INCDIR}/net -# install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h - install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h - install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h - install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h - oe_libinstall -a -so libpcap ${STAGING_LIBDIR} -} diff --git a/packages/libpcap/libpcap_0.8.3.bb b/packages/libpcap/libpcap_0.8.3.bb index 43ff0f3fce..bdf68e8d3f 100644 --- a/packages/libpcap/libpcap_0.8.3.bb +++ b/packages/libpcap/libpcap_0.8.3.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Network Packet Capture Library" HOMEPAGE = "http://www.tcpdump.org/" LICENSE = "BSD" SECTION = "libs" -PRIORITY = "required" +PR = "r1" SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \ file://shared.patch;patch=1" -# file://configure.patch;patch=1" inherit autotools @@ -26,5 +25,6 @@ do_stage () { install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h oe_libinstall -a -so libpcap ${STAGING_LIBDIR} - ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h + install -d ${STAGING_INCDIR}/net + ln -sf ${STAGING_INCDIR}/pcap-bpf.h ${STAGING_INCDIR}/net/bpf.h } -- cgit v1.2.3