X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fgdb%2FMakefile;h=5044033a21df133aa082e32e8258dc5c59c599d7;hb=16ec0a70b319bd911a573becd4c51e094710f1a7;hp=85da76df589fcd480ce06fd7c262cc8ddcf6d616;hpb=79128e76e6d64d225d71aed0ac2e609eadd9d6b2;p=openwrt-10.03%2F.git

diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 85da76df5..5044033a2 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdb
 PKG_VERSION:=6.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@GNU/gdb
@@ -19,16 +20,19 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gdb/Default
   SECTION:=utils
   CATEGORY:=Utilities
+  DEPENDS:=@!(avr32||cris)
 endef
 
 define Package/gdb
 $(call Package/gdb/Default)
   TITLE:=GNU Debugger
-  DEPENDS+= +libreadline +libncurses
+  DEPENDS+=+libreadline +libncurses
 endef
 
 define Package/gdb/description
- GNU debugger
+GDB, the GNU Project debugger, allows you to see what is going on `inside'
+another program while it executes -- or what another program was doing at the
+moment it crashed.
 endef
 
 define Package/gdbserver
@@ -37,12 +41,14 @@ $(call Package/gdb/Default)
 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.
+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
 
+# XXX: add --disable-werror to prevent build failure with arm
 CONFIGURE_ARGS+= \
-	--with-system-readline
+	--with-system-readline \
+	--disable-werror
 
 CONFIGURE_VARS+= \
 	ac_cv_search_tgetent="$(TARGET_LDFLAGS) -lncurses -lreadline"
@@ -51,19 +57,22 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		CPPFLAGS="$(TARGET_CPPFLAGS)" \
-		all install-gdb
+		all
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		install-gdb
 endef
 
-define Package/gdb/install	
+define Package/gdb/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdb $(1)/usr/bin/
 endef
 
-define Package/gdbserver/install	
+define Package/gdbserver/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,gdb))
 $(eval $(call BuildPackage,gdbserver))
-