mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-12 09:54:53 +00:00
4297f4f901
Update libpcap to upstream release 1.8.1 Change the name from libpcap.so.1.3 to libpcap.so.1 Remove parts of patch 201 which moved code among src files. Import patch 204 from Debian to update the USB path. Signed-off-by: Paul Wassi <p.wassi@gmx.at> Signed-off-by: Felix Fietkau <nbd@nbd.name> [fix parallel build bug]
176 lines
4.9 KiB
Diff
176 lines
4.9 KiB
Diff
Debian-specific modifications to the upstream Makefile.in to
|
|
build a shared library.
|
|
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -38,6 +38,13 @@ mandir = @mandir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
+# some defines for shared library compilation
|
|
+LIBVERSION=1
|
|
+LIBNAME=pcap
|
|
+LIBRARY=lib$(LIBNAME).a
|
|
+SOLIBRARY=lib$(LIBNAME).so
|
|
+SHAREDLIB=$(SOLIBRARY).$(LIBVERSION)
|
|
+
|
|
#
|
|
# You shouldn't need to edit anything below.
|
|
#
|
|
@@ -62,7 +69,8 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
|
|
PROG=libpcap
|
|
|
|
# Standard CFLAGS
|
|
-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
|
|
+FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS)
|
|
+CFLAGS_SHARED = -shared -Wl,-soname,$(SHAREDLIB)
|
|
|
|
INSTALL = @INSTALL@
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
@@ -77,7 +85,11 @@ YACC = @YACC@
|
|
# problem if you don't own the file but can write to the directory.
|
|
.c.o:
|
|
@rm -f $@
|
|
- $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
|
|
+ $(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
|
|
+
|
|
+%_pic.o: %.c %.o
|
|
+ @rm -f $@
|
|
+ $(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
|
|
|
|
PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@
|
|
FSRC = @V_FINDALLDEVS@
|
|
@@ -93,6 +105,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
|
|
# 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)
|
|
PUBHDR = \
|
|
pcap.h \
|
|
pcap-bpf.h \
|
|
@@ -157,7 +170,7 @@ TAGFILES = \
|
|
|
|
CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
|
|
$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
|
- lex.yy.c pcap-config
|
|
+ lex.yy.c pcap-config $(OBJ_PIC)
|
|
|
|
MAN1 = pcap-config.1
|
|
|
|
@@ -365,7 +378,7 @@ libpcap.a: $(OBJ)
|
|
$(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
|
|
$(RANLIB) $@
|
|
|
|
-shared: libpcap.$(DYEXT)
|
|
+shared: $(SHAREDLIB)
|
|
|
|
libpcap.so: $(OBJ)
|
|
@rm -f $@
|
|
@@ -443,6 +456,12 @@ libpcap.shareda: $(OBJ)
|
|
#
|
|
libpcap.none:
|
|
|
|
+$(SHAREDLIB): $(OBJ_PIC)
|
|
+ -@rm -f $@
|
|
+ -@rm -f $(SOLIBRARY)
|
|
+ $(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $(SHAREDLIB) $(OBJ_PIC) -lc $(LIBS)
|
|
+ ln -s $(SHAREDLIB) $(SOLIBRARY)
|
|
+
|
|
scanner.c: $(srcdir)/scanner.l
|
|
$(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $<
|
|
scanner.h: scanner.c
|
|
@@ -455,6 +474,9 @@ scanner.h: scanner.c
|
|
scanner.o: scanner.c grammar.h
|
|
$(CC) $(FULL_CFLAGS) -c scanner.c
|
|
|
|
+scanner_pic.o: scanner.c grammar.h
|
|
+ $(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c
|
|
+
|
|
pcap.o: pcap_version.h
|
|
|
|
grammar.c: $(srcdir)/grammar.y
|
|
@@ -472,9 +494,16 @@ grammar.o: grammar.c
|
|
gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
|
|
$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
|
|
|
|
+grammar_pic.o: grammar.c
|
|
+ @rm -f $@
|
|
+ $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
|
|
+
|
|
version.o: version.c
|
|
$(CC) $(FULL_CFLAGS) -c version.c
|
|
|
|
+version_pic.o: version.c
|
|
+ $(CC) -fPIC $(FULL_CFLAGS) -c version.c -o $@
|
|
+
|
|
snprintf.o: $(srcdir)/missing/snprintf.c
|
|
$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
|
|
|
|
@@ -501,6 +530,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
|
|
bpf_filter.o: bpf_filter.c
|
|
$(CC) $(FULL_CFLAGS) -c bpf_filter.c
|
|
|
|
+bpf_filter_pic.o: bpf_filter.c
|
|
+ $(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@
|
|
+
|
|
#
|
|
# Generate the pcap-config script.
|
|
#
|
|
@@ -623,14 +655,11 @@ install: install-shared install-archive
|
|
$(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
|
|
|
|
install-shared: install-shared-$(DYEXT)
|
|
-install-shared-so: libpcap.so
|
|
+install-shared-so: $(SHAREDLIB)
|
|
[ -d $(DESTDIR)$(libdir) ] || \
|
|
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
|
|
- VER=`cat $(srcdir)/VERSION`; \
|
|
- MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
|
|
- $(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
|
|
- ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
|
|
- ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
|
|
+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
|
|
+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY)
|
|
install-shared-dylib: libpcap.dylib
|
|
[ -d $(DESTDIR)$(libdir) ] || \
|
|
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
|
|
--- a/aclocal.m4
|
|
+++ b/aclocal.m4
|
|
@@ -470,7 +470,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
|
|
esac
|
|
;;
|
|
esac
|
|
- V_CCOPT="$V_CCOPT $PIC_OPT"
|
|
+ V_CCOPT="$V_CCOPT"
|
|
V_SONAME_OPT="-Wl,-soname,"
|
|
V_RPATH_OPT="-Wl,-rpath,"
|
|
;;
|
|
@@ -533,7 +533,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
|
|
#
|
|
# "cc" is GCC.
|
|
#
|
|
- V_CCOPT="$V_CCOPT -fpic"
|
|
+ V_CCOPT="$V_CCOPT"
|
|
V_SHLIB_CMD="\$(CC)"
|
|
V_SHLIB_OPT="-shared"
|
|
V_SONAME_OPT="-Wl,-soname,"
|
|
--- a/pcap-config.in
|
|
+++ b/pcap-config.in
|
|
@@ -36,16 +36,6 @@ do
|
|
esac
|
|
shift
|
|
done
|
|
-if [ "$V_RPATH_OPT" != "" ]
|
|
-then
|
|
- #
|
|
- # If libdir isn't /usr/lib, add it to the run-time linker path.
|
|
- #
|
|
- if [ "$libdir" != "/usr/lib" ]
|
|
- then
|
|
- RPATH=$V_RPATH_OPT$libdir
|
|
- fi
|
|
-fi
|
|
if [ "$static" = 1 ]
|
|
then
|
|
#
|