[csw-devel] SF.net SVN: gar:[6607] csw/mgar/pkg/libpcap/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Sep 29 13:37:55 CEST 2009
Revision: 6607
http://gar.svn.sourceforge.net/gar/?rev=6607&view=rev
Author: dmichelsen
Date: 2009-09-29 11:37:54 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
libpcap: Add shared library support
Modified Paths:
--------------
csw/mgar/pkg/libpcap/trunk/Makefile
csw/mgar/pkg/libpcap/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/libpcap/trunk/files/shared-library.diff
Removed Paths:
-------------
csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff
csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff
Modified: csw/mgar/pkg/libpcap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:32:04 UTC (rev 6606)
+++ csw/mgar/pkg/libpcap/trunk/Makefile 2009-09-29 11:37:54 UTC (rev 6607)
@@ -2,7 +2,7 @@
GARVERSION = 1.0.0
CATEGORIES = lib
-DESCRIPTION = Libraries for network diagnostics
+DESCRIPTION = System-independent interface for user-level packet capture
define BLURB
A system-independent interface for user-level network packet capture.
endef
@@ -17,14 +17,16 @@
PATCHFILES = sf-bugtrack-2224954-fix-autoconf-header.diff
PATCHFILES += sf-bugtrack-2504874-create-dir-patch.diff
+PATCHFILES += shared-library.diff
-# Shared libraries patch
-#PATCHFILES = Makefile.in.diff
-#PATCHFILES += scanner.l.diff
+PACKAGES = CSWlibpcap CSWlibpcapdevel
-# No test target for libpcap
-TEST_SCRIPTS =
+CATALOGNAME_CSWlibpcap = libpcap
+CATALOGNAME_CSWlibpcapdevel = libpcap_devel
+SPKG_DESC_CSWlibpcap = System-independent interface for user-level packet capture
+SPKG_DESC_CSWlibpcapdevel = libpcap development files
+
BUILD64 = 1
EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis
@@ -34,9 +36,25 @@
EXTRA_CFLAGS = -I.
+EXTRA_CFLAGS_isa-sparcv9 = -xcode=pic32
+EXTRA_CFLAGS_isa-amd64 = -xcode=pic32
+EXTRA_CFLAGS += $(EXTRA_CFLAGS_isa-$(ISA))
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-ipv6
+# Make sure shared libraries are built
+BUILD_ARGS = shared
INSTALL_ARGS = install-shared
+# No test target for libpcap
+TEST_SCRIPTS =
+
+MERGE_DIRS_isa-sparcv8plus = $(libdir)
+MERGE_DIRS_isa-sparcv8plus+vis = $(libdir)
+MERGE_DIRS_isa-pentium = $(libdir)
+MERGE_DIRS_isa-pentium_pro+mmx = $(libdir)
+
+PKGFILES_CSWlibpcapdevel = $(PKGFILES_DEVEL)
+
include gar/category.mk
Modified: csw/mgar/pkg/libpcap/trunk/checksums
===================================================================
--- csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:32:04 UTC (rev 6606)
+++ csw/mgar/pkg/libpcap/trunk/checksums 2009-09-29 11:37:54 UTC (rev 6607)
@@ -1,3 +1,4 @@
9ad1358c5dec48456405eac197a46d3d download/libpcap-1.0.0.tar.gz
4b3aba885cc3a967721616419e1b17d1 download/sf-bugtrack-2224954-fix-autoconf-header.diff
10f021b867602038e71a48f5662467bc download/sf-bugtrack-2504874-create-dir-patch.diff
+3115b52dbe16ed2b4174ed19fb63f2d6 download/shared-library.diff
Deleted: csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:32:04 UTC (rev 6606)
+++ csw/mgar/pkg/libpcap/trunk/files/Makefile.in.diff 2009-09-29 11:37:54 UTC (rev 6607)
@@ -1,116 +0,0 @@
---- ../build-global/libpcap-0.9.8/Makefile.in 2007-07-24 04:35:15.000000000 +0200
-+++ libpcap-0.9.8/Makefile.in 2009-04-09 04:07:28.839392745 +0200
-@@ -37,6 +37,15 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
-
-+# some defines for shared library compilation - FIXME
-+MAJ=0
-+MIN=9.8
-+VERSION=$(MAJ).$(MIN)
-+LIBNAME=pcap
-+LIBRARY=lib$(LIBNAME).a
-+SOLIBRARY=lib$(LIBNAME).so
-+SHAREDLIB=$(SOLIBRARY).$(VERSION)
-+
- #
- # You shouldn't need to edit anything below.
- #
-@@ -52,6 +61,7 @@
-
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
-+CFLAGS_SHARED = -G $(LDFLAGS) -Wl,-h,$(SOLIBRARY).$(MAJ)
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -71,7 +81,11 @@
- # problem if you don't own the file but can write to the directory.
- .c.o:
- @rm -f $@
-- $(CC) $(CFLAGS) -c $(srcdir)/$*.c
-+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
-+
-+%_pic.o: %.c
-+ @rm -f $@
-+ $(CC) -KPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
-
- PSRC = pcap- at V_PCAP@.c
- FSRC = fad- at V_FINDALLDEVS@.c
-@@ -86,6 +100,8 @@
- # 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=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.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 = \
-@@ -98,14 +114,22 @@
- $(SRC) $(HDR) $(TAGHDR)
-
- CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
-+CLEANFILES = $(OBJ) $(OBJ_PIC) 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)
-+ - at rm -f $@
-+ - at rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
-+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
-+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
-+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
-+
- shared: libpcap.$(DYEXT)
-
- #
-@@ -131,6 +155,9 @@
- scanner.o: scanner.c tokdefs.h
- $(CC) $(CFLAGS) -c scanner.c
-
-+scanner_pic.o: scanner.c tokdefs.h
-+ $(CC) -KPIC $(CFLAGS) -o $@ -c scanner.c
-+
- pcap.o: version.h
-
- tokdefs.h: grammar.c
-@@ -144,9 +171,16 @@
- @rm -f $@
- $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
-
-+grammar_pic.o: grammar.c
-+ @rm -f $@
-+ $(CC) -KPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
-+
- version.o: version.c
- $(CC) $(CFLAGS) -c version.c
-
-+version_pic.o: version.c
-+ $(CC) -KPIC $(CFLAGS) -o $@ -c version.c
-+
- snprintf.o: $(srcdir)/missing/snprintf.c
- $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
-
-@@ -172,10 +206,16 @@
- bpf_filter.o: bpf_filter.c
- $(CC) $(CFLAGS) -c bpf_filter.c
-
-+bpf_filter_pic.o: bpf_filter.c
-+ $(CC) -KPIC $(CFLAGS) -o $@ -c bpf_filter.c
-+
- install: libpcap.a
- [ -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))
Deleted: csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:32:04 UTC (rev 6606)
+++ csw/mgar/pkg/libpcap/trunk/files/scanner.l.diff 2009-09-29 11:37:54 UTC (rev 6607)
@@ -1,11 +0,0 @@
---- ../build-global/libpcap-0.9.8/scanner.l 2007-06-11 21:34:28.000000000 +0200
-+++ libpcap-0.9.8/scanner.l 2009-04-09 04:41:33.481612776 +0200
-@@ -32,6 +32,8 @@
- #include <ctype.h>
- #include <string.h>
-
-+#include <stdlib.h>
-+
- #include "pcap-int.h"
-
- #include "gencode.h"
Added: csw/mgar/pkg/libpcap/trunk/files/shared-library.diff
===================================================================
--- csw/mgar/pkg/libpcap/trunk/files/shared-library.diff (rev 0)
+++ csw/mgar/pkg/libpcap/trunk/files/shared-library.diff 2009-09-29 11:37:54 UTC (rev 6607)
@@ -0,0 +1,12 @@
+diff -Naur libpcap-1.0.0.orig/Makefile.in libpcap-1.0.0.patched/Makefile.in
+--- libpcap-1.0.0.orig/Makefile.in 2008-10-28 02:26:13.000000000 +0100
++++ libpcap-1.0.0.patched/Makefile.in 2009-09-28 21:54:53.647596468 +0200
+@@ -326,7 +326,7 @@
+ #
+ libpcap.so: $(OBJ)
+ @rm -f $@
+- $(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
++ $(CC) -G -o $@.`cat $(srcdir)/VERSION` $(LDFLAGS) $(OBJ) $(DAGLIBS)
+
+ #
+ # The following rule succeeds, but the result is untested.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list