diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-19 12:40:04 +0200 |
commit | d186e96728bff4cc4873c59d48d01fe6eefe6131 (patch) | |
tree | 1eefcef8058414b07b2750f52d9746f5323472ff /core/m4 | |
parent | 84c217e2d9acc64713978324761816e2468b5292 (diff) | |
parent | 1fedf1f5d5351aefd88268cba7353c79adac9b8a (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/collectd/PKGBUILD
community/drivel/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnomesu/PKGBUILD
community/gnuchess/PKGBUILD
community/gphpedit/PKGBUILD
community/gsql/PKGBUILD
community/libmatchbox/PKGBUILD
community/lockfile-progs/PKGBUILD
community/opencc/PKGBUILD
community/roxterm/PKGBUILD
community/uriparser/PKGBUILD
community/xcircuit/PKGBUILD
core/bison/PKGBUILD
core/curl/PKGBUILD
core/expat/PKGBUILD
core/gcc/PKGBUILD
core/gpm/PKGBUILD
core/m4/PKGBUILD
core/systemd/PKGBUILD
core/tar/PKGBUILD
extra/alsa-lib/PKGBUILD
extra/alsa-utils/PKGBUILD
extra/bitlbee/PKGBUILD
extra/chkrootkit/PKGBUILD
extra/fakechroot/PKGBUILD
extra/farstream/PKGBUILD
extra/freeglut/PKGBUILD
extra/gob2/PKGBUILD
extra/libcdio-paranoia/PKGBUILD
extra/liblqr/PKGBUILD
extra/libnl1/PKGBUILD
extra/libpst/PKGBUILD
extra/libwpd/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'core/m4')
-rw-r--r-- | core/m4/PKGBUILD | 21 | ||||
-rw-r--r-- | core/m4/m4.install | 2 |
2 files changed, 15 insertions, 8 deletions
diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index 860958c53..d4a9da421 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ +# $Id: PKGBUILD 183048 2013-04-17 02:02:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 pkgver=1.4.16 -pkgrel=2.2 +pkgrel=3 pkgdesc="The GNU macro processor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/m4" @@ -16,14 +16,21 @@ source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} m4-1.4.16-readlink-einval.patch gnulib-no-gets.patch) md5sums=('7548ec061a1ba993790159764f522d0e' - 'eebe5c94e74e7551e2e30c5844f1b653' - 'cea138fa9b568d06e46269611cec8dd0' - '9593407bef0afdca88c76a2959d6596f') + 'SKIP' + 'cea138fa9b568d06e46269611cec8dd0') -build() { +prepare() { cd ${srcdir}/$pkgname-$pkgver + + # glibc-2.16 compatibility + sed -i -e '/gets is a/d' lib/stdio.in.h + + # patch testsuite failure with newer kernels patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch - patch -p1 -i "$srcdir/gnulib-no-gets.patch" +} + +build() { + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make } diff --git a/core/m4/m4.install b/core/m4/m4.install index be4138170..523d39bd6 100644 --- a/core/m4/m4.install +++ b/core/m4/m4.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(m4.info m4.info-1 m4.info-2) +filelist=('m4.info' 'm4.info-1' 'm4.info-2') post_install() { [ -x usr/bin/install-info ] || return 0 |