diff options
| -rw-r--r-- | package/libpcap/Makefile | 7 | ||||
| -rw-r--r-- | package/libpcap/patch-Makefile_in | 14 |
2 files changed, 15 insertions, 6 deletions
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index d0b333e5e..806c3e2d7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,12 +4,11 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.6.1 +PKG_VERSION:= 1.6.2 PKG_RELEASE:= 1 PKG_HASH:= 116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476 PKG_DESCR:= low-level packet capture library PKG_SECTION:= libs/net -PKG_BUILDDEP:= m4-host flex-host bison-host libnl PKG_URL:= http://www.tcpdump.org/ PKG_SITES:= http://www.tcpdump.org/release/ PKG_OPTS:= dev @@ -29,17 +28,13 @@ CONFIGURE_ARGS+= --disable-yydebug \ --disable-dbus \ --without-libnl \ --with-pcap=linux -TARGET_CFLAGS+= ${TARGET_CPPFLAGS} INSTALL_TARGET= install install-shared -MAKE_FLAGS+= STAGING_TARGET_DIR=$(STAGING_TARGET_DIR) -XAKE_FLAGS+= GCC_HONOUR_COPTS=s ifneq (${ADK_PACKAGE_LIBPCAP_WITH_IPV6},) CONFIGURE_ARGS+= --enable-ipv6 else CONFIGURE_ARGS+= --disable-ipv6 endif -#XAKE_FLAGS+= M4=m4 libpcap-install: ${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib diff --git a/package/libpcap/patch-Makefile_in b/package/libpcap/patch-Makefile_in new file mode 100644 index 000000000..cd7bdc961 --- /dev/null +++ b/package/libpcap/patch-Makefile_in @@ -0,0 +1,14 @@ + Use $(sort) here, which implicitly removes duplicates. + Otherwise our CFLAGS are passed in via CCOPT and CFLAGS leading + to duplicate -fhonour-copts passing. +--- libpcap-1.6.2.orig/Makefile.in 2014-07-03 00:12:49.000000000 +0200 ++++ libpcap-1.6.2/Makefile.in 2014-09-12 15:12:48.567519024 +0200 +@@ -61,7 +61,7 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ + PROG=libpcap + + # Standard CFLAGS +-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) ++FULL_CFLAGS = $(sort $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)) + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ |