aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-12-19 20:43:46 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-12-19 20:43:46 +0000
commitbf2bdceeee9c93332e61a5fad1b6e49177254e16 (patch)
treead16ab016964b74337e7b4140e029d19586daea0
parent72e8d7b8e7a00f07d0d731afbcf3939058889bf3 (diff)
downloadaports-bf2bdceeee9c93332e61a5fad1b6e49177254e16.tar.bz2
aports-bf2bdceeee9c93332e61a5fad1b6e49177254e16.tar.xz
main/atop: fix musl build
-rw-r--r--main/atop/APKBUILD12
-rw-r--r--main/atop/musl-fix-includes.patch65
2 files changed, 75 insertions, 2 deletions
diff --git a/main/atop/APKBUILD b/main/atop/APKBUILD
index 13be69f5fe..a32c250c0f 100644
--- a/main/atop/APKBUILD
+++ b/main/atop/APKBUILD
@@ -2,7 +2,7 @@
pkgname=atop
pkgver=2.0.2
_ver=${pkgver/_p/-}
-pkgrel=1
+pkgrel=2
pkgdesc="Resource-specific view of processes"
url="http://www.atcomputing.nl/Tools/atop"
arch="all"
@@ -12,12 +12,17 @@ makedepends="zlib-dev ncurses-dev"
subpackages="$pkgname-doc"
source="http://www.atoptool.nl/download/atop-$_ver.tar.gz
atop-bb-compat.patch
+ musl-fix-includes.patch
atop.initd"
_builddir="$srcdir"/$pkgname-$_ver
prepare() {
cd "$_builddir"
- patch -p1 -i "$srcdir"/atop-bb-compat.patch || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
sed -i -e '/^CFLAGS/s: = -O : += :' \
-e '/^LDFLAGS/s: = : += :' Makefile
cp "$srcdir"/atop.initd atop.init
@@ -44,10 +49,13 @@ package() {
md5sums="f1dd1984584f9635712cb7196e25620c atop-2.0.2.tar.gz
3b4c7d162eafcd3db6e2647269065823 atop-bb-compat.patch
+01f5be19880c3ac217f805b3af74de78 musl-fix-includes.patch
06aba14ddeadbb1d0c3594536785213b atop.initd"
sha256sums="a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409 atop-2.0.2.tar.gz
cc5ceb0b01024cacc923c5c224a6241644900d240bd214ba9c3c3e52ec5758e0 atop-bb-compat.patch
+73927ed070edb59fd18739816c14446d64c7f80b29f3333bdfa5f99c27c10970 musl-fix-includes.patch
7ee9e4ec7e4d29a3e2f099e0967870c180a493494f360be0132612f15dd50f8a atop.initd"
sha512sums="c02b1c2ebf5c49fb0ad17bbcf0b86af8e5623c8d0b6ba8b1096d9b592cbb358e011933142cdebc90f619221785e859aaa009a338f3682d8bfa4340a50b308471 atop-2.0.2.tar.gz
918fda65f27c9b58b6f58a4ff0a169ef8218e9819e85c111d00cfcee6f37825c15c20d13599b1f6a796d3546aaa5f3466d6b90c6d951709d0216364dc43f4256 atop-bb-compat.patch
+0c0398221f6ab3625676d49f9e961b183baa62f84eb0165e1d3f34a93c56be6c4865735be87093a22ce59b159b632321824cb1b0ea046af4b26a94ee0f7d4907 musl-fix-includes.patch
fb31e3db9bed226a284e6e8b2845b9b59db9a5d58f611b5291722a0fa004b7c0dbb9ccd660d8679302fd719b06c66f4b20a8ea04f4b18bd69af96afb7793e5f4 atop.initd"
diff --git a/main/atop/musl-fix-includes.patch b/main/atop/musl-fix-includes.patch
new file mode 100644
index 0000000000..44f42015ae
--- /dev/null
+++ b/main/atop/musl-fix-includes.patch
@@ -0,0 +1,65 @@
+--- atop-2.0.2.orig/deviate.c
++++ atop-2.0.2/deviate.c
+@@ -178,6 +178,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <limits.h>
+ #include <memory.h>
+--- atop-2.0.2.orig/procdbase.c
++++ atop-2.0.2/procdbase.c
+@@ -67,7 +67,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "atop.h"
+ #include "photoproc.h"
+--- atop-2.0.2.orig/showgeneric.c
++++ atop-2.0.2/showgeneric.c
+@@ -268,7 +268,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <string.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <curses.h>
+--- atop-2.0.2.orig/showlinux.c
++++ atop-2.0.2/showlinux.c
+@@ -274,7 +274,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <curses.h>
+--- atop-2.0.2.orig/showprocs.c
++++ atop-2.0.2/showprocs.c
+@@ -94,7 +94,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <curses.h>
+--- atop-2.0.2.orig/showsys.c
++++ atop-2.0.2/showsys.c
+@@ -80,7 +80,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <termio.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include <stdarg.h>
+ #include <curses.h>