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/strace/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'package/strace')

diff --git a/package/strace/Makefile b/package/strace/Makefile
index fac6fc3f2..0597dc2cc 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -8,16 +8,13 @@ PKG_VERSION:=		4.8
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		system call trace program
-PKG_SECTION:=		debug
+PKG_SECTION:=		app/debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRACE,strace,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+=		-static
-endif
 ifeq ($(ADK_TARGET_LIB_MUSL),y)
 TARGET_CPPFLAGS+=	-DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
 ifeq ($(ADK_LINUX_PPC),y)
-- 
cgit v1.2.3