package/libpcap/patches/100-debian_shared_lib.patch

   1 Debian-specific modifications to the upstream Makefile.in to
   2 build a shared library.
   3 ---
   4  Makefile.in  |   45 ++++++++++++++++++++++++++++++++++++++++++---
   5  configure    |    2 +-
   6  configure.in |    2 +-
   7  3 files changed, 44 insertions(+), 5 deletions(-)
   8
   9 --- a/Makefile.in
  10 +++ b/Makefile.in
  11 @@ -40,6 +40,14 @@ mandir = @mandir@
  12  srcdir = @srcdir@
  13  VPATH = @srcdir@
  14
  15 +# some defines for shared library compilation
  16 +MAJ=1.1
  17 +LIBVERSION=$(MAJ).1
  18 +LIBNAME=pcap
  19 +LIBRARY=lib$(LIBNAME).a
  20 +SOLIBRARY=lib$(LIBNAME).so
  21 +SHAREDLIB=$(SOLIBRARY).$(LIBVERSION)
  22 +
  23  #
  24  # You shouldn't need to edit anything below.
  25  #
  26 @@ -59,6 +67,7 @@ PROG=libpcap
  27
  28  # Standard CFLAGS
  29  CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
  30 +CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
  31
  32  INSTALL = @INSTALL@
  33  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  34 @@ -78,7 +87,11 @@ YACC = @V_YACC@
  35  # problem if you don't own the file but can write to the directory.
  36  .c.o:
  37         @rm -f $@
  38 -       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
  39 +       $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
  40 +
  41 +%_pic.o: %.c
  42 +       @rm -f $@
  43 +       $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
  44
  45  PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@
  46  FSRC =  fad-@V_FINDALLDEVS@.c
  47 @@ -94,6 +107,7 @@ SRC =        $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
  48  # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
  49  # hack the extra indirection
  50  OBJ =  $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
  51 +OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
  52  PUBHDR = \
  53         pcap.h \
  54         pcap-bpf.h \
  55 @@ -131,7 +145,7 @@ TAGFILES = \
  56
  57  CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \
  58         opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
  59 -       lex.yy.c pcap-config
  60 +       lex.yy.c pcap-config $(OBJ_PIC)
  61
  62  MAN1 = pcap-config.1
  63
  64 @@ -324,7 +338,7 @@ EXTRA_DIST = \
  65         Win32/Src/inet_net.c \
  66         Win32/Src/inet_pton.c
  67
  68 -all: libpcap.a shared pcap-config
  69 +all: libpcap.a shared pcap-config $(SHAREDLIB)
  70
  71  libpcap.a: $(OBJ)
  72         @rm -f $@
  73 @@ -409,6 +423,13 @@ libpcap.shareda: $(OBJ)
  74  #
  75  libpcap.none:
  76
  77 +$(SHAREDLIB): $(OBJ_PIC)
  78 +       -@rm -f $@
  79 +       -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
  80 +       $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
  81 +       ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
  82 +       ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
  83 +
  84  scanner.c: $(srcdir)/scanner.l
  85         @rm -f $@
  86         $(srcdir)/runlex.sh $(LEX) -o$@ $<
  87 @@ -416,6 +437,9 @@ scanner.c: $(srcdir)/scanner.l
  88  scanner.o: scanner.c tokdefs.h
  89         $(CC) $(CFLAGS) -c scanner.c
  90
  91 +scanner_pic.o: scanner.c tokdefs.h
  92 +       $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
  93 +
  94  pcap.o: version.h
  95
  96  tokdefs.h: grammar.c
  97 @@ -429,9 +453,17 @@ grammar.o: grammar.c
  98         @rm -f $@
  99         $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
 100
 101 +grammar_pic.o: grammar.c
 102 +       @rm -f $@
 103 +       $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
 104 +
 105  version.o: version.c
 106         $(CC) $(CFLAGS) -c version.c
 107
 108 +version_pic.o: version.c
 109 +       $(CC) -fPIC $(CFLAGS) -c version.c -o $@
 110 +
 111 +
 112  snprintf.o: $(srcdir)/missing/snprintf.c
 113         $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
 114
 115 @@ -469,6 +501,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
 116  bpf_filter.o: bpf_filter.c
 117         $(CC) $(CFLAGS) -c bpf_filter.c
 118
 119 +bpf_filter_pic.o: bpf_filter.c
 120 +       $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
 121 +
 122  #
 123  # Generate the pcap-config script.
 124  #
 125 @@ -604,6 +639,9 @@ install-archive-so install-archive-dylib
 126             (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 127         $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
 128         $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
 129 +       $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
 130 +       ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
 131 +       ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
 132  install-archive-shareda:
 133         #
 134         # AIX, however, doesn't, so we don't install the archive
 135 --- a/configure
 136 +++ b/configure
 137 @@ -3229,7 +3229,7 @@ _ACEOF
 138                     # or accepts command-line arguments like
 139                     # those the GNU linker accepts.
 140                     #
 141 -                   V_CCOPT="$V_CCOPT -fpic"
 142 +                   V_CCOPT="$V_CCOPT"
 143                     V_SONAME_OPT="-Wl,-soname,"
 144                     V_RPATH_OPT="-Wl,-rpath,"
 145                     ;;
 146 @@ -3292,7 +3292,7 @@ _ACEOF
 147                     #
 148                     # "cc" is GCC.
 149                     #
 150 -                   V_CCOPT="$V_CCOPT -fpic"
 151 +                   V_CCOPT="$V_CCOPT"
 152                     V_SHLIB_CMD="\$(CC)"
 153                     V_SHLIB_OPT="-shared"
 154                     V_SONAME_OPT="-Wl,-soname,"