rename libmisc.a to libipfixmisc.a
libmisc.a is too generic to be globally staged. It was clashing with xinetd builds. SVN-Revision: 32066
This commit is contained in:
parent
95e69ac4f1
commit
e2a63ac51d
|
@ -36,7 +36,7 @@ define Build/Compile
|
||||||
exec_prefix="$(PKG_INSTALL_DIR)/usr" \
|
exec_prefix="$(PKG_INSTALL_DIR)/usr" \
|
||||||
all install
|
all install
|
||||||
$(TARGET_CROSS)ranlib $(PKG_INSTALL_DIR)/usr/lib/libipfix.a
|
$(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
|
endef
|
||||||
|
|
||||||
define Build/InstallDev
|
define Build/InstallDev
|
||||||
|
|
27
package/libipfix/patches/120-ipfixmisc.patch
Normal file
27
package/libipfix/patches/120-ipfixmisc.patch
Normal file
|
@ -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)
|
||||||
|
|
|
@ -111,7 +111,7 @@ ifdef CONFIG_PACKAGE_wprobe-export
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
|
CPPFLAGS="$(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/kernel -I$(PKG_BUILD_DIR)/user" \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
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
|
endef
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user