From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/libdnet/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package/libdnet')

diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index 6c5b331fc..07b7892e7 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.11
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		04c394ed8e1e7fc455456e79e908916d
 PKG_DESCR:=		low-level networking library
-PKG_SECTION:=		libs
+PKG_SECTION:=		libs/net
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://libdnet.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/}
@@ -21,7 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 AUTOTOOL_STYLE:=	autoreconf
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		ac_cv_dnet_bsd_bpf=no
 CONFIGURE_ARGS+=	--without-check
 
-- 
cgit v1.2.3