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/gdb/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'package/gdb/Makefile')

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 0ee1da3d1..a69cc580c 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc
 
 PKG_NAME:=		gdb
 PKG_DESCR:=		programm debugger
-PKG_SECTION:=		debug
+PKG_SECTION:=		app/debug
 PKG_DEPENDS:=		libthread-db libncurses libexpat zlib
 PKG_BUILDDEP:=		ncurses readline libiconv-tiny expat zlib
 PKG_NOPARALLEL:=	1
@@ -15,11 +15,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_STATIC),y)
-TARGET_CFLAGS+=         -static
-CONFIGURE_ARGS+=	--enable-static
-endif
-
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS} -fPIC
 CONFIGURE_ARGS+=	--without-uiout \
 			--disable-tui \
-- 
cgit v1.2.3