diff options
| author | John Crispin <john@openwrt.org> | 2012-06-05 17:49:57 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-06-05 17:49:57 +0000 |
| commit | e2a63ac51d1f70355a83a947527cb0cd2169b26d (patch) | |
| tree | 7303770177d804f2c404ac20fab505204770c683 /package/libipfix | |
| parent | 95e69ac4f1c9f2cac8300da5d1055fc5be2ad9b8 (diff) | |
| download | upstream-e2a63ac51d1f70355a83a947527cb0cd2169b26d.tar.gz upstream-e2a63ac51d1f70355a83a947527cb0cd2169b26d.tar.bz2 upstream-e2a63ac51d1f70355a83a947527cb0cd2169b26d.zip | |
rename libmisc.a to libipfixmisc.a
libmisc.a is too generic to be globally staged. It was clashing with xinetd
builds.
SVN-Revision: 32066
Diffstat (limited to 'package/libipfix')
| -rw-r--r-- | package/libipfix/Makefile | 2 | ||||
| -rw-r--r-- | package/libipfix/patches/120-ipfixmisc.patch | 27 |
2 files changed, 28 insertions, 1 deletions
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) + |