aboutsummaryrefslogtreecommitdiffstats
path: root/package/libipfix/patches
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-06-05 17:49:57 +0000
committerJohn Crispin <blogic@openwrt.org>2012-06-05 17:49:57 +0000
commitc87050440ca9aca213322224fd9ed96afed99dca (patch)
treef5bb6175c02c501caa8a3cf2c560ce48ac63fcc0 /package/libipfix/patches
parentff53498dd2c7e1768abb5ff31371090216ac8019 (diff)
downloadupstream-c87050440ca9aca213322224fd9ed96afed99dca.tar.gz
upstream-c87050440ca9aca213322224fd9ed96afed99dca.tar.bz2
upstream-c87050440ca9aca213322224fd9ed96afed99dca.zip
[wprobe/ipfix] rename libmisc.a to libipfixmisc.a
libmisc.a is too generic to be globally staged. It was clashing with xinetd builds. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32066 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libipfix/patches')
-rw-r--r--package/libipfix/patches/120-ipfixmisc.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/package/libipfix/patches/120-ipfixmisc.patch b/package/libipfix/patches/120-ipfixmisc.patch
new file mode 100644
index 0000000000..e3f5a05c65
--- /dev/null
+++ b/package/libipfix/patches/120-ipfixmisc.patch
@@ -0,0 +1,27 @@
+Index: libipfix.r51/lib/Makefile.in
+===================================================================
+--- libipfix.r51.orig/lib/Makefile.in 2008-08-05 15:15:23.000000000 +0200
++++ libipfix.r51/lib/Makefile.in 2012-06-05 19:26:34.061692890 +0200
+@@ -41,7 +41,7 @@
+ INCLS = -I. -I..
+ CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
+
+-TARGETS = libmisc.a libipfix.a
++TARGETS = libipfixmisc.a libipfix.a
+ OBJS = ipfix.o ipfix_col.o ipfix_print.o \
+ ipfix_col_files.o ipfix_col_db.o @IPFIX_DB_OBJ@ @IPFIX_SSL_OBJ@
+ DEPHDR = ipfix.h ipfix_def.h ipfix_fields.h ipfix_def_fokus.h ipfix_fields_fokus.h
+@@ -60,11 +60,11 @@
+ install:
+ @[ -d ${libdir} ] || (mkdir -p ${libdir}; chmod 755 ${libdir})
+ $(INSTALL_DATA) libipfix.a ${libdir}/
+- $(INSTALL_DATA) libmisc.a ${libdir}/
++ $(INSTALL_DATA) libipfixmisc.a ${libdir}/
+ @[ -d ${includedir} ] || (mkdir -p ${includedir}; chmod 755 ${includedir})
+ $(INSTALL_HEADER) ipfix*.h mlog.h mpoll.h ${includedir}/
+
+-libmisc.a: $(MISCOBJS) Makefile
++libipfixmisc.a: $(MISCOBJS) Makefile
+ @rm -f $@
+ $(AR) rc $@ $(MISCOBJS)
+