diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-01-06 08:48:40 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-01-06 08:48:40 +0000 |
| commit | 006d43d66950b8facf7bfff7f337e6385f9e5081 (patch) | |
| tree | 46d257d66b600d5d99f53adde659206f0dfb9777 | |
| parent | a162da839db0d3f8be94a5c1ad2e2e54e691c38a (diff) | |
| download | aports-006d43d66950b8facf7bfff7f337e6385f9e5081.tar.bz2 aports-006d43d66950b8facf7bfff7f337e6385f9e5081.tar.xz | |
main/dpkg: fix armhf build
| -rw-r--r-- | main/dpkg/APKBUILD | 23 | ||||
| -rw-r--r-- | main/dpkg/add-muslgnueabihf.patch | 10 |
2 files changed, 27 insertions, 6 deletions
diff --git a/main/dpkg/APKBUILD b/main/dpkg/APKBUILD index 6d17a4b1f9..6e4227865c 100644 --- a/main/dpkg/APKBUILD +++ b/main/dpkg/APKBUILD @@ -1,18 +1,26 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dpkg pkgver=1.18.4 -pkgrel=0 +pkgrel=1 pkgdesc="The Debian Package Manager" url="http://packages.debian.org/dpkg" arch="all" license="GPL" makedepends="bzip2-dev zlib-dev perl" subpackages="$pkgname-doc $pkgname-dev" -source="http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver.tar.xz" +source="http://ftp.de.debian.org/debian/pool/main/d/$pkgname/${pkgname}_$pkgver.tar.xz + add-muslgnueabihf.patch + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg "$i"; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + sed -i "s|<ncursesw/curses.h>|<curses.h>|g" dselect/dselect.h \ dselect/Makefile.in || return 1 sed -i "s|<ncursesw/term.h>|<term.h>|g" dselect/main.cc || return 1 @@ -28,7 +36,7 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-zlib \ - --with-bzip2 \ + --with-bz2 \ --disable-dselect \ --disable-start-stop-daemon \ || return 1 @@ -67,6 +75,9 @@ dev() { mv "$pkgdir"/usr/lib/dpkg/parsechangelog "$subpkgdir"/usr/lib/dpkg/ } -md5sums="e95b513c89693f6ec3ab53b6b1c3defd dpkg_1.18.4.tar.xz" -sha256sums="fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da dpkg_1.18.4.tar.xz" -sha512sums="047a1b38b685d48557aaf8baa847042d7b4ef38de1bcc069108a7b12f29fd84c16caccaeb79c9a1f6445ea8a3327f5d81ff692dfadd0151a0c8e2ed4e24b5f45 dpkg_1.18.4.tar.xz" +md5sums="e95b513c89693f6ec3ab53b6b1c3defd dpkg_1.18.4.tar.xz +360155cfe9e989a9ee12b56a579dfa75 add-muslgnueabihf.patch" +sha256sums="fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da dpkg_1.18.4.tar.xz +63d331e297e2e5765bf919485cc87f6ce307344f38921015a5564f94b37af6e1 add-muslgnueabihf.patch" +sha512sums="047a1b38b685d48557aaf8baa847042d7b4ef38de1bcc069108a7b12f29fd84c16caccaeb79c9a1f6445ea8a3327f5d81ff692dfadd0151a0c8e2ed4e24b5f45 dpkg_1.18.4.tar.xz +5f83bce6a1d724f690ba8eded74c87dbd3b4c8a7850a53d5c68ad7cfc9712662a50a8a00a02329b2be64f3246cff1d6d7037950a81d4732aba2498ac1da114ac add-muslgnueabihf.patch" diff --git a/main/dpkg/add-muslgnueabihf.patch b/main/dpkg/add-muslgnueabihf.patch new file mode 100644 index 0000000000..52d5330eb3 --- /dev/null +++ b/main/dpkg/add-muslgnueabihf.patch @@ -0,0 +1,10 @@ +--- dpkg-1.18.4.orig/ostable ++++ dpkg-1.18.4/ostable +@@ -15,6 +15,7 @@ + uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi + uclibc-linux linux-uclibc linux[^-]*-uclibc + musleabihf-linux linux-musleabihf linux[^-]*-musleabihf ++musleabihf-linux linux-musleabihf linux[^-]*-muslgnueabihf + musl-linux linux-musl linux[^-]*-musl + gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf + gnueabi-linux linux-gnueabi linux[^-]*-gnueabi |