forked from tungstenfabric/tf-third-party
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathlibipfix_patch1.diff
More file actions
62 lines (57 loc) · 2.38 KB
/
Copy pathlibipfix_patch1.diff
File metadata and controls
62 lines (57 loc) · 2.38 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
diff -ru a/libipfix_110209/collector/Makefile.in b/libipfix_110209/collector/Makefile.in
--- a/libipfix_110209/collector/Makefile.in 2011-02-09 17:57:38.000000000 +0300
+++ b/libipfix_110209/collector/Makefile.in 2018-03-22 12:53:54.000000000 +0300
@@ -37,7 +37,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ @MYSQLLIBS@ @SCTPLIBS@ @SSLLIBS@ -L../lib -L../libmisc -lipfix -lmisc
-CCOPT = -Wall -g
+CCOPT = -Wall -g -fPIC
INCLS = -I. -I.. -I../lib -I../libmisc
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
diff -ru a/libipfix_110209/lib/Makefile.in b/libipfix_110209/lib/Makefile.in
--- a/libipfix_110209/lib/Makefile.in 2011-02-09 17:57:38.000000000 +0300
+++ b/libipfix_110209/lib/Makefile.in 2018-04-10 13:09:52.427716225 +0300
@@ -37,14 +37,14 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-CCOPT = -Wall -g
-#CCOPT = -Wall -g -fPIC
+#CCOPT = -Wall -g
+CCOPT = -Wall -g -fPIC
INCLS = -I. -I.. -I../.. -I../libmisc
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
LIBMISCDIR = ../libmisc
-TARGETS = libipfix.a
-#TARGETS = libipfix.a libipfix.so
+#TARGETS = libipfix.a
+TARGETS = libipfix.so
OBJS = ipfix.o ipfix_col.o ipfix_print.o $(LIBMISCDIR)/libmisc.a \
ipfix_col_files.o ipfix_col_db.o @IPFIX_DB_OBJ@ @IPFIX_SSL_OBJ@
DEPHDR = ipfix.h ipfix_def.h ipfix_fields.h
@@ -61,11 +61,12 @@
install:
@[ -d ${libdir} ] || (mkdir -p ${libdir}; chmod 755 ${libdir})
- $(INSTALL_DATA) libipfix.a ${libdir}/
-# $(INSTALL_DATA) libipfix.so.$(VERSION) ${libdir}/
+# $(INSTALL_DATA) libipfix.a ${libdir}/
+ $(INSTALL_DATA) libipfix.so.$(VERSION) ${libdir}/
$(INSTALL_DATA) $(LIBMISCDIR)/libmisc.a ${libdir}/
@[ -d ${includedir} ] || (mkdir -p ${includedir}; chmod 755 ${includedir})
-# ln -s ${libdir}/libipfix.so.$(VERSION) ${libdir}/libipfix.so
+ @[ -f ${libdir}/libipfix.so ] || (ln -s ${libdir}/libipfix.so.$(VERSION) ${libdir}/libipfix.so)
+ chmod 755 ${libdir}/libipfix.so.$(VERSION)
$(INSTALL_HEADER) ipfix*.h ${includedir}/
$(LIBMISCDIR)/libmisc.a:
diff -ru a/libipfix_110209/libmisc/Makefile.in b/libipfix_110209/libmisc/Makefile.in
--- a/libipfix_110209/libmisc/Makefile.in 2011-02-09 17:57:38.000000000 +0300
+++ b/libipfix_110209/libmisc/Makefile.in 2018-03-22 12:53:54.000000000 +0300
@@ -38,7 +38,7 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ -lm @PCAPLIBS@
-CCOPT = -Wall -g
+CCOPT = -Wall -g -fPIC
INCLS = -I. -I.. -I../.. @PCAPINCLS@
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)