100-shared-lib.patch 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120
  1. diff -urN libpcap-0.9.4.orig/Makefile.in libpcap-0.9.4/Makefile.in
  2. --- libpcap-0.9.4.orig/Makefile.in 2003-12-15 02:35:03.000000000 +0100
  3. +++ libpcap-0.9.4/Makefile.in 2006-02-05 16:56:18.000000000 +0100
  4. @@ -37,6 +37,15 @@
  5. srcdir = @srcdir@
  6. VPATH = @srcdir@
  7. +# some defines for shared library compilation
  8. +MAJ=0.9
  9. +MIN=4
  10. +VERSION=$(MAJ).$(MIN)
  11. +LIBNAME=pcap
  12. +LIBRARY=lib$(LIBNAME).a
  13. +SOLIBRARY=lib$(LIBNAME).so
  14. +SHAREDLIB=$(SOLIBRARY).$(VERSION)
  15. +
  16. #
  17. # You shouldn't need to edit anything below.
  18. #
  19. @@ -50,6 +59,7 @@
  20. # Standard CFLAGS
  21. CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
  22. +CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
  23. INSTALL = @INSTALL@
  24. INSTALL_PROGRAM = @INSTALL_PROGRAM@
  25. @@ -70,7 +80,12 @@
  26. .c.o:
  27. @rm -f $@
  28. $(CC) $(CFLAGS) -c $(srcdir)/$*.c
  29. + $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
  30. +%_pic.o: %.c
  31. + @rm -f $@
  32. + $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
  33. +
  34. PSRC = pcap-@[email protected]
  35. FSRC = fad-@[email protected]
  36. SSRC = @SSRC@
  37. @@ -84,6 +99,7 @@
  38. # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
  39. # hack the extra indirection
  40. OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
  41. +OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
  42. HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
  43. ethertype.h gencode.h gnuc.h
  44. GENHDR = \
  45. @@ -95,15 +111,23 @@
  46. TAGFILES = \
  47. $(SRC) $(HDR) $(TAGHDR)
  48. -CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
  49. +CLEANFILES = $(OBJ) $(OBJ_PIC) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c libpcap.so*
  50. -all: libpcap.a
  51. +all: libpcap.a $(SHAREDLIB)
  52. libpcap.a: $(OBJ)
  53. @rm -f $@
  54. ar rc $@ $(OBJ) $(LIBS)
  55. $(RANLIB) $@
  56. +$(SHAREDLIB): $(OBJ_PIC)
  57. + -@rm -f $@
  58. + -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
  59. + $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
  60. + ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
  61. + ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
  62. +
  63. +
  64. shared: libpcap.$(DYEXT)
  65. #
  66. @@ -129,6 +153,10 @@
  67. scanner.o: scanner.c tokdefs.h
  68. $(CC) $(CFLAGS) -c scanner.c
  69. +scanner_pic.o: scanner.c tokdefs.h
  70. + $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
  71. +
  72. +
  73. pcap.o: version.h
  74. tokdefs.h: grammar.c
  75. @@ -142,9 +170,16 @@
  76. @rm -f $@
  77. $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
  78. +grammar_pic.o: grammar.c
  79. + @rm -f $@
  80. + $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
  81. +
  82. version.o: version.c
  83. $(CC) $(CFLAGS) -c version.c
  84. +version_pic.o: version.c
  85. + $(CC) -fPIC $(CFLAGS) -c version.c -o $@
  86. +
  87. snprintf.o: $(srcdir)/missing/snprintf.c
  88. $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  89. @@ -170,10 +205,17 @@
  90. bpf_filter.o: bpf_filter.c
  91. $(CC) $(CFLAGS) -c bpf_filter.c
  92. +bpf_filter_pic.o: bpf_filter.c
  93. + $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
  94. +
  95. +
  96. install: libpcap.a
  97. [ -d $(DESTDIR)$(libdir) ] || \
  98. (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
  99. $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
  100. + $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
  101. + ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
  102. + ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
  103. $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
  104. [ -d $(DESTDIR)$(includedir) ] || \
  105. (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))