summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/binutils/APKBUILD19
-rw-r--r--system/bubblewrap/APKBUILD1
-rw-r--r--system/bzip2/APKBUILD5
3 files changed, 9 insertions, 16 deletions
diff --git a/system/binutils/APKBUILD b/system/binutils/APKBUILD
index f5defac52..fc6113836 100644
--- a/system/binutils/APKBUILD
+++ b/system/binutils/APKBUILD
@@ -4,16 +4,16 @@ pkgver=2.32
pkgrel=5
pkgdesc="Tools necessary to build programs"
url="https://www.gnu.org/software/binutils/"
+arch="all"
+# non-PIC is unsupported by musl/ppc
+[ "${CARCH}" != "ppc" ] || options='!check'
+license="GPL-2.0+ AND GPL-3.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND LGPL-3.0+ AND BSD-3-Clause"
depends=""
makedepends_build="byacc flex texinfo"
makedepends_host="zlib-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="dejagnu"
-arch="all"
-license="GPL-2.0+ AND GPL-3.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND LGPL-3.0+ AND BSD-3-Clause"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
-# non-PIC is unsupported by musl/ppc
-[ "${CARCH}" != "ppc" ] || options='!check'
source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
arm-pie.patch
binutils-ld-fix-static-linking.patch
@@ -90,7 +90,6 @@ build() {
*) _hash_style_configure="--enable-default-hash-style=gnu" ;;
esac
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -117,8 +116,11 @@ build() {
make
}
+check() {
+ make check
+}
+
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
if [ -d "$pkgdir"/usr/lib64 ]; then
die "Something really bad happened."
@@ -133,11 +135,6 @@ package() {
fi
}
-check() {
- cd "$builddir"
- make check
-}
-
libs() {
pkgdesc="Runtime libraries from binutils"
diff --git a/system/bubblewrap/APKBUILD b/system/bubblewrap/APKBUILD
index 8823c4db2..c4ae4fa31 100644
--- a/system/bubblewrap/APKBUILD
+++ b/system/bubblewrap/APKBUILD
@@ -22,7 +22,6 @@ source="bubblewrap-$pkgver.tar.gz::https://github.com/projectatomic/bubblewrap/a
# - CVE-2019-12439
prepare() {
- cd "$builddir"
srcdir= NOCONFIGURE=1 ./autogen.sh
default_prepare
}
diff --git a/system/bzip2/APKBUILD b/system/bzip2/APKBUILD
index ed22b0137..b609d57bc 100644
--- a/system/bzip2/APKBUILD
+++ b/system/bzip2/APKBUILD
@@ -2,7 +2,7 @@
pkgname=bzip2
pkgver=1.0.8
pkgrel=0
-pkgdesc="A high-quality data compression program"
+pkgdesc="Block-sorting file compressor"
url="https://www.sourceware.org/bzip2/"
arch="all"
license="BSD-4-Clause"
@@ -40,18 +40,15 @@ prepare() {
}
build () {
- cd "$builddir"
make -f Makefile-libbz2_so all
make all
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make PREFIX="$pkgdir"/usr install
install -D libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so.$pkgver
ln -s libbz2.so.$pkgver "$pkgdir"/usr/lib/libbz2.so