binutils: make libiberty-devel into subpkg

This commit is contained in:
oreo639 2023-01-25 21:05:01 -08:00 committed by Leah Neukirchen
parent eb1b1c7e0b
commit 8d5e95679d
3 changed files with 18 additions and 20 deletions

View file

@ -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
}
}

1
srcpkgs/libiberty-devel Symbolic link
View file

@ -0,0 +1 @@
binutils

View file

@ -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"