mac80211: fix firmware compat stuff for 2.6.32

[openwrt.git] / package / gdb / Makefile

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index a2d5c85..6a166d0 100644 (file)
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -1,53 +1,59 @@
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdb
-PKG_VERSION:=6.3
+PKG_VERSION:=6.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=05b928f41fa5b482e49ca2c24762a0ae
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gdb
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=@GNU/gdb
+PKG_MD5SUM:=c9da266b884fb8fa54df786dfaadbc7a
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/gdb
+define Package/gdb/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libreadline +libncurses
-  TITLE:=GNU Debugger
+  DEPENDS:= @!(avr32||cris)
 endef
 
-define Package/gdbserver
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Remote server for GNU Debugger
+define Package/gdb
+$(call Package/gdb/Default)
+  TITLE:=GNU Debugger
+  DEPENDS+= +libreadline +libncurses
 endef
 
 define Package/gdb/description
  GNU debugger
 endef
 
+define Package/gdbserver
+$(call Package/gdb/Default)
+  TITLE:=Remote server for GNU Debugger
+endef
+
 define Package/gdbserver/description
  GDBSERVER is a program that allows you to run GDB on a different machine 
  than the one which is running the program being debugged.
 endef
 
-TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib
+# XXX: add --disable-werror to prevent build failure with arm
+CONFIGURE_ARGS+= \
+       --with-system-readline \
+       --disable-werror \
 
-export ac_cv_search_tgetent=$(TARGET_LDFLAGS) -lncurses -lreadline
+CONFIGURE_VARS+= \
+       ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
+               CPPFLAGS="$(TARGET_CPPFLAGS)" \
                all install-gdb
 endef
 
@@ -58,7 +64,7 @@ endef
 
 define Package/gdbserver/install       
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdb $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,gdb))