From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 17 Jun 2019 23:43:51 +0000 (-0700)
Subject: gdb: Remove !arc dependency
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=787922682a0e41409159f4d55c5f0148dc4ecb16;p=openwrt%2Fstaging%2Fblogic.git

gdb: Remove !arc dependency

Supported since 8.0.

Added uClibc-ng patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/package/devel/gdb/Makefile b/package/devel/gdb/Makefile
index 434fb41df45a..a5b752326acc 100644
--- a/package/devel/gdb/Makefile
+++ b/package/devel/gdb/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gdb
 PKG_VERSION:=8.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gdb
@@ -25,8 +25,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gdb/Default
   SECTION:=devel
   CATEGORY:=Development
-  DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib @!arc
-  URL:=http://www.gnu.org/software/gdb/
+  DEPENDS:=+!USE_MUSL:libthread-db +PACKAGE_zlib:zlib
+  URL:=https://www.gnu.org/software/gdb/
 endef
 
 define Package/gdb
diff --git a/package/devel/gdb/patches/130-uclibc-fix.patch b/package/devel/gdb/patches/130-uclibc-fix.patch
new file mode 100644
index 000000000000..ea39acac2182
--- /dev/null
+++ b/package/devel/gdb/patches/130-uclibc-fix.patch
@@ -0,0 +1,11 @@
+--- a/gdb/dwarf-index-write.c
++++ b/gdb/dwarf-index-write.c
+@@ -705,7 +705,7 @@ public:
+     gdb_assert (m_abbrev_table.empty ());
+     const size_t name_count = m_name_to_value_set.size ();
+     m_bucket_table.resize
+-      (std::pow (2, std::ceil (std::log2 (name_count * 4 / 3))));
++      (std::pow (2, std::ceil (log2 (name_count * 4 / 3))));
+     m_hash_table.reserve (name_count);
+     m_name_table_string_offs.reserve (name_count);
+     m_name_table_entry_offs.reserve (name_count);