aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-03-29 19:23:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-03-29 20:40:47 +0000
commit26c2c1c570c2a56728a8190f335748779fe2ac0b (patch)
tree5d5b90b0ece96a80011091c6b375f4d9d439bad6
parentde82d70d4c1bd554daa1bb5202c92ee9b0f7023a (diff)
downloadaports-26c2c1c570c2a56728a8190f335748779fe2ac0b.tar.gz
aports-26c2c1c570c2a56728a8190f335748779fe2ac0b.tar.bz2
aports-26c2c1c570c2a56728a8190f335748779fe2ac0b.tar.xz
main/m4: upgrade to 1.4.16
-rw-r--r--main/m4/APKBUILD8
-rw-r--r--main/m4/gnulib-uclibc.patch13
2 files changed, 3 insertions, 18 deletions
diff --git a/main/m4/APKBUILD b/main/m4/APKBUILD
index 0f58750bb6..7216a43b7a 100644
--- a/main/m4/APKBUILD
+++ b/main/m4/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=m4
-pkgver=1.4.15
+pkgver=1.4.16
pkgrel=0
pkgdesc="GNU macro processor"
url="http://www.gnu.org/software/m4"
@@ -9,12 +9,11 @@ arch="all"
license="GPL"
subpackages="m4-doc"
source="ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
- gnulib-uclibc.patch"
+ "
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -p1 -i "$srcdir"/gnulib-uclibc.patch
}
build() {
@@ -28,5 +27,4 @@ package() {
make install DESTDIR="$pkgdir"
}
-md5sums="5649a2e593b6c639deae9e72ede777dd m4-1.4.15.tar.gz
-20a7dedec0e9e0ee7107e33e798ffdbe gnulib-uclibc.patch"
+md5sums="a5dfb4f2b7370e9d34293d23fd09b280 m4-1.4.16.tar.gz"
diff --git a/main/m4/gnulib-uclibc.patch b/main/m4/gnulib-uclibc.patch
deleted file mode 100644
index 09775d6b18..0000000000
--- a/main/m4/gnulib-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/spawn.in.h b/lib/spawn.in.h
-index 84ba93c..6df4599 100644
---- a/lib/spawn.in.h
-+++ b/lib/spawn.in.h
-@@ -31,7 +31,7 @@
-
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
- But avoid namespace pollution on glibc systems. */
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) || defined(__UCLIBC__)
- # include <sched.h>
- # include <signal.h>
- #endif