From: John Crispin <john@openwrt.org>
Date: Tue, 5 Jun 2012 17:49:57 +0000 (+0000)
Subject: rename libmisc.a to libipfixmisc.a
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e2a63ac51d1f70355a83a947527cb0cd2169b26d;p=openwrt%2Fstaging%2Fldir.git

rename libmisc.a to libipfixmisc.a

libmisc.a is too generic to be globally staged. It was clashing with xinetd
builds.

SVN-Revision: 32066
---

diff --git a/package/libipfix/Makefile b/package/libipfix/Makefile
index 272b87c6ac..e4c9315910 100644
--- a/package/libipfix/Makefile
+++ b/package/libipfix/Makefile
@@ -36,7 +36,7 @@ define Build/Compile
 		exec_prefix="$(PKG_INSTALL_DIR)/usr" \
 		all install
 	$(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfix.a
-	$(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libmisc.a
+	$(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfixmisc.a
 endef
 
 define Build/InstallDev
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) 
+ 
diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile
index 1986cfa224..de1ba6d636 100644
--- a/package/wprobe/Makefile
+++ b/package/wprobe/Makefile
@@ -111,7 +111,7 @@ ifdef CONFIG_PACKAGE_wprobe-export
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libmisc.a -lnl-tiny -lm"
+		LIBS="$(PKG_BUILD_DIR)/user/libwprobe.a $(STAGING_DIR)/usr/lib/libipfix.a $(STAGING_DIR)/usr/lib/libipfixmisc.a -lnl-tiny -lm"
   endef
 endif