aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-10-04 11:56:05 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-10-04 11:56:05 +0000
commit374cb8d3e8fc65b8dafedb1107b130ff7d522f91 (patch)
tree38769a86121ea0b5748784be6befe3d07a5ccd2e /main
parent64aaedf0178d8bfbb7e4f7d04c84b794e2997d88 (diff)
downloadaports-374cb8d3e8fc65b8dafedb1107b130ff7d522f91.tar.bz2
aports-374cb8d3e8fc65b8dafedb1107b130ff7d522f91.tar.xz
main/libgtop: fix musl build
Diffstat (limited to 'main')
-rw-r--r--main/libgtop/APKBUILD12
-rw-r--r--main/libgtop/fix-includes.patch27
2 files changed, 35 insertions, 4 deletions
diff --git a/main/libgtop/APKBUILD b/main/libgtop/APKBUILD
index 27bdb4002e..62f3d12a2c 100644
--- a/main/libgtop/APKBUILD
+++ b/main/libgtop/APKBUILD
@@ -12,7 +12,8 @@ depends_dev="glib-dev libxau-dev libx11-dev"
makedepends="$depends_dev intltool"
install=""
subpackages="$pkgname-dev $pkgname-doc"
-source="http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+source="http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+ fix-includes.patch"
_builddir="${srcdir}/${pkgname}-${pkgver}"
prepare() {
@@ -43,6 +44,9 @@ package() {
rm "$pkgdir"/usr/lib/*.la || return 1
}
-md5sums="3f15032ef2bf06f2b26efd13bc4ae9ab libgtop-2.28.5.tar.xz"
-sha256sums="c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342 libgtop-2.28.5.tar.xz"
-sha512sums="9e7e645ea2a525edfd8e616cde7830b2175a6203113c27bcb81a6a853b16b2be14fa44b373a1c993b49a2f8ffb12dcf3a9f556f41b82b3d869e66f1650f75052 libgtop-2.28.5.tar.xz"
+md5sums="3f15032ef2bf06f2b26efd13bc4ae9ab libgtop-2.28.5.tar.xz
+960e79a36922645ae73cf95cda27ae15 fix-includes.patch"
+sha256sums="c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342 libgtop-2.28.5.tar.xz
+2d4d009fbb25defcf2750116f67c56d4e12cb619e07236fad018d473a7d7e13b fix-includes.patch"
+sha512sums="9e7e645ea2a525edfd8e616cde7830b2175a6203113c27bcb81a6a853b16b2be14fa44b373a1c993b49a2f8ffb12dcf3a9f556f41b82b3d869e66f1650f75052 libgtop-2.28.5.tar.xz
+12fb9a7586a07cbae9d66034bafc250ea09cc4d7f231fe908372c6cb0da61f7d13c7f87c46a4c9dbbc1fe75f57555b342e4af5dcf2e9cb5f88724b02c1ca3096 fix-includes.patch"
diff --git a/main/libgtop/fix-includes.patch b/main/libgtop/fix-includes.patch
new file mode 100644
index 0000000000..846eaff8ff
--- /dev/null
+++ b/main/libgtop/fix-includes.patch
@@ -0,0 +1,27 @@
+--- libgtop-2.28.5.orig/sysdeps/linux/netload.c
++++ libgtop-2.28.5/sysdeps/linux/netload.c
+@@ -34,8 +34,6 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+
+-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+-/* GNU LibC */
+ #include <net/if.h>
+ #include <netinet/ip_icmp.h>
+ #include <netinet/in.h>
+@@ -43,15 +41,6 @@
+ #include <netinet/tcp.h>
+ #include <netinet/udp.h>
+ #include <net/if.h>
+-#else /* Libc 5 */
+-#include <linux/if.h>
+-#include <linux/in.h>
+-#include <linux/ip.h>
+-#include <linux/icmp.h>
+-#include <linux/tcp.h>
+-#include <linux/udp.h>
+-#endif
+-
+
+ #ifdef HAVE_IFADDRS_H
+ /* needed for IPV6 support */