diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 13:51:13 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-20 13:52:55 +0000 |
| commit | 37c71417836476d5ec33db9b228112a83e1a60e8 (patch) | |
| tree | af4118613719fba408f6a7192fd13f4a2a7cf951 | |
| parent | 2def78e08b7794dea10f8fdbbcaea2a71da7f45c (diff) | |
| download | aports-37c71417836476d5ec33db9b228112a83e1a60e8.tar.bz2 aports-37c71417836476d5ec33db9b228112a83e1a60e8.tar.xz | |
main/m4: fix build against musl
- patch in new gnulib + updated autotools generated files
- update_config_sub
- remove charset.alias if exists
| -rw-r--r-- | main/m4/APKBUILD | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD index 3647bb5fe6..62d7c2e6da 100644 --- a/main/m4/APKBUILD +++ b/main/m4/APKBUILD @@ -1,23 +1,25 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=m4 pkgver=1.4.16 -pkgrel=1 +pkgrel=2 pkgdesc="GNU macro processor" url="http://www.gnu.org/software/m4" depends= +makedepends=texinfo arch="all" license="GPL" subpackages="m4-doc" source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz + http://dev.alpinelinux.org/~tteras/m4-1.4.16-gnulib-update.patch.gz " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - # fix eglibc-2.16+ build issue - sed -i -e '/gets is a/d' \ - lib/stdio.in.h || return 1 + msg "Applying m4-1.4.16-gnulib-update.patch" + gunzip < "$srcdir"/m4-1.4.16-gnulib-update.patch.gz | patch -Z -p1 || return 1 + update_config_sub || return 1 } build() { @@ -33,6 +35,14 @@ build() { package() { cd "$_builddir" make install DESTDIR="$pkgdir" + rm -rf "$pkgdir"/usr/lib/charset.alias + rmdir -p "$pkgdir"/usr/lib 2>/dev/null + return 0 } -md5sums="a5dfb4f2b7370e9d34293d23fd09b280 m4-1.4.16.tar.gz" +md5sums="a5dfb4f2b7370e9d34293d23fd09b280 m4-1.4.16.tar.gz +c22f770441aa5dc30521b93eb76f496d m4-1.4.16-gnulib-update.patch.gz" +sha256sums="e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da m4-1.4.16.tar.gz +66dc61cc20891bc3af88de1fe3907a05135686edbd750a570163a0035fb269cc m4-1.4.16-gnulib-update.patch.gz" +sha512sums="633afe79feabe9764675dcfb79eb91e6ed09a89405bcbefec64afb6f422a269f35905ee3c02bfcbff75b911870926791ef5bdf0c6cf27b5b2b9c9ae55cd70cf6 m4-1.4.16.tar.gz +15b4d9776e0818000ed2ba64c8446b6404d9986d682fbcd5ca08b73fbc59cf0bec2f0441f293a2216d82e49bf934c4043a022a946dfe6665b6f262415f6356cd m4-1.4.16-gnulib-update.patch.gz" |