From a2ca8d3598e7d162db33dd625aad1b68c9619904 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 25 Jan 2023 21:05:01 -0800
Subject: [PATCH] binutils: make libiberty-devel into subpkg

---
 srcpkgs/binutils/template        | 21 +++++++++++++++++----
 srcpkgs/libiberty-devel          |  1 +
 srcpkgs/libiberty-devel/template | 16 ----------------
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 120000 srcpkgs/libiberty-devel
 delete mode 100644 srcpkgs/libiberty-devel/template

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index c355a5fc8016..441e43553904 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
 # Template file for 'binutils'
 pkgname=binutils
 version=2.39
-revision=1
+revision=2
 bootstrap=yes
 hostmakedepends="pkgconf"
 makedepends="zlib-devel"
@@ -9,7 +9,7 @@ short_desc="GNU binary utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/binutils/"
-distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
+distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
 checksum=645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
 
 subpackages="binutils-doc"
@@ -18,7 +18,7 @@ if [ "$CHROOT_READY" ]; then
 	makedepends+=" elfutils-devel"
 	checkdepends="bc"
 	depends="binutils-doc"
-	subpackages+=" binutils-devel"
+	subpackages+=" libiberty-devel binutils-devel"
 fi
 
 _get_triplet() {
@@ -36,7 +36,7 @@ do_configure() {
 	local conf
 
 	if [ "$CHROOT_READY" ]; then
-		conf+=" --with-debuginfod --enable-shared"
+		conf+=" --with-debuginfod --enable-shared --enable-install-libiberty"
 	else
 		conf+=" --without-debuginfod --disable-shared --disable-install-libbfd"
 	fi
@@ -132,6 +132,9 @@ do_install() {
 			>${DESTDIR}/usr/lib/libbfd.so
 		echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
 			>${DESTDIR}/usr/lib/libopcodes.so
+
+		# Install PIC version of libiberty.a
+		vinstall build/libiberty/pic/libiberty.a 755 usr/lib
 	fi
 
 	# Remove useless manpages.
@@ -163,3 +166,13 @@ binutils-doc_package() {
 		rm -f ${PKGDESTDIR}/usr/share/info/standards.info
 	}
 }
+
+libiberty-devel_package() {
+	reverts="20220713_1 20210106_1"
+	short_desc="Library of utility functions used by GNU programs"
+	conflicts="binutils-devel<=2.35.1_3"
+	pkg_install() {
+		vmove usr/include/libiberty
+		vmove usr/lib/libiberty.a
+	}
+}
diff --git a/srcpkgs/libiberty-devel b/srcpkgs/libiberty-devel
new file mode 120000
index 000000000000..695eb82eae64
--- /dev/null
+++ b/srcpkgs/libiberty-devel
@@ -0,0 +1 @@
+binutils
\ No newline at end of file
diff --git a/srcpkgs/libiberty-devel/template b/srcpkgs/libiberty-devel/template
deleted file mode 100644
index d9618e3806ba..000000000000
--- a/srcpkgs/libiberty-devel/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'libiberty-devel'
-pkgname=libiberty-devel
-version=20220713
-revision=1
-build_wrksrc=libiberty
-build_style=gnu-configure
-configure_args="--disable-multilib --enable-install-libiberty"
-short_desc="Library of utility functions used by GNU programs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="http://gcc.gnu.org/"
-distfiles="http://deb.debian.org/debian/pool/main/libi/libiberty/libiberty_${version}.orig.tar.xz"
-checksum=b59050f48c8a0f9c9e6fba5d17c7a4f11d1329de0c0dca7331b767a6d2bbe8d9
-conflicts="binutils-devel<=2.35.1_3"
-
-CFLAGS="-fPIC"