aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/squashfs-tools/APKBUILD14
-rw-r--r--main/squashfs-tools/squashfs-tools-4.0-uclibc-get_nprocs.patch22
2 files changed, 5 insertions, 31 deletions
diff --git a/main/squashfs-tools/APKBUILD b/main/squashfs-tools/APKBUILD
index f5ac12c8de..9b83324055 100644
--- a/main/squashfs-tools/APKBUILD
+++ b/main/squashfs-tools/APKBUILD
@@ -1,19 +1,16 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squashfs-tools
-pkgver=4.0
-pkgrel=1
+pkgver=4.1
+pkgrel=0
pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
url="http://squashfs.sourceforge.net"
license="GPL"
depends=
-makedepends="zlib-dev"
-source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz
- squashfs-tools-4.0-uclibc-get_nprocs.patch"
+makedepends="zlib-dev attr-dev"
+source="http://downloads.sourceforge.net/sourceforge/squashfs/squashfs$pkgver.tar.gz"
build() {
cd "$srcdir"/squashfs$pkgver/$pkgname
- patch -p2 -i "$srcdir"/squashfs-tools-4.0-uclibc-get_nprocs.patch \
- || return 1
make
}
@@ -22,5 +19,4 @@ package() {
mkdir -p "$pkgdir"/sbin
cp -a mksquashfs unsquashfs "$pkgdir"/sbin
}
-md5sums="a3c23391da4ebab0ac4a75021ddabf96 squashfs4.0.tar.gz
-761580c100eeffb60ebbda62d724bd3f squashfs-tools-4.0-uclibc-get_nprocs.patch"
+md5sums="8e1b2b96f5d5f3fe48fef226ae8cd341 squashfs4.1.tar.gz"
diff --git a/main/squashfs-tools/squashfs-tools-4.0-uclibc-get_nprocs.patch b/main/squashfs-tools/squashfs-tools-4.0-uclibc-get_nprocs.patch
deleted file mode 100644
index 9c6312f16b..0000000000
--- a/main/squashfs-tools/squashfs-tools-4.0-uclibc-get_nprocs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/squashfs-tools/mksquashfs.c Wed Dec 2 10:30:31 2009
-+++ b/squashfs-tools/mksquashfs.c Wed Dec 2 10:31:34 2009
-@@ -3705,7 +3705,7 @@
- processors = 1;
- }
- #else
-- processors = get_nprocs();
-+ processors = sysconf(_SC_NPROCESSORS_ONLN);
- #endif
- }
-
---- a/squashfs-tools/unsquashfs.c Wed Dec 2 10:30:31 2009
-+++ b/squashfs-tools/unsquashfs.c Wed Dec 2 10:31:34 2009
-@@ -1811,7 +1811,7 @@
- processors = 1;
- }
- #else
-- processors = get_nprocs();
-+ processors = sysconf(_SC_NPROCESSORS_ONLN);
- #endif
- }
-