diff options
| author | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-05 17:49:57 +0000 |
|---|---|---|
| committer | blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-06-05 17:49:57 +0000 |
| commit | bae921b2aaacae7d4751f198523c5274be46d5c6 (patch) | |
| tree | f5bb6175c02c501caa8a3cf2c560ce48ac63fcc0 | |
| parent | 9216dfc76c9f71ca13d284978ed29fceebbb5e7d (diff) | |
[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
| -rw-r--r-- | package/libipfix/Makefile | 2 | ||||
| -rw-r--r-- | package/libipfix/patches/120-ipfixmisc.patch | 27 | ||||
| -rw-r--r-- | package/wprobe/Makefile | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/package/libipfix/Makefile b/package/libipfix/Makefile index 272b87c6a..e4c931591 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 000000000..e3f5a05c6 --- /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 1986cfa22..de1ba6d63 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 |