From cb3ef8b314ad677075a1636e26f36285feec5999 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 26 Mar 2014 10:54:05 +0000
Subject: main/strace: build fix uclibc after fixing musl

---
 main/strace/APKBUILD         | 10 +++++++---
 main/strace/uclibc-fix.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 main/strace/uclibc-fix.patch

(limited to 'main/strace')

diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD
index c654bb6a83..51bc62c6e2 100644
--- a/main/strace/APKBUILD
+++ b/main/strace/APKBUILD
@@ -11,6 +11,7 @@ makedepends=
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz
 	strace-musl.patch
+	uclibc-fix.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -44,8 +45,11 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 md5sums="c575ef43829586801f514fd91bfe7575  strace-4.8.tar.xz
-41e03d475f6db117177463a4be14b6f7  strace-musl.patch"
+41e03d475f6db117177463a4be14b6f7  strace-musl.patch
+4906d85aaf996831cca1dcbd13f3f5b5  uclibc-fix.patch"
 sha256sums="f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8  strace-4.8.tar.xz
-07518bec47f2c68d85849029e13df39d225bbc85b8577885467b5c195c8df41f  strace-musl.patch"
+07518bec47f2c68d85849029e13df39d225bbc85b8577885467b5c195c8df41f  strace-musl.patch
+b089fc949aab33d791acb5939ef64cc74726fa0e599300be4fcb41ca005be78f  uclibc-fix.patch"
 sha512sums="c3316382f60cd4d02eec1eef46a0ef2d000afbccf2c176a6fec652e1b3391685f0e33f184497cb3ccf54d72d460471a4945d3a864fb5bce1f45f32fdf132cfe3  strace-4.8.tar.xz
-fb87b9a5317cb162e2ebf8f303b9f169de366ef4b8aee1d17ce595bd42a551960e42e84df75d2dcc4d779945e366d4c7dcc6f612bf66f1ed50bb6e9fd38ac169  strace-musl.patch"
+fb87b9a5317cb162e2ebf8f303b9f169de366ef4b8aee1d17ce595bd42a551960e42e84df75d2dcc4d779945e366d4c7dcc6f612bf66f1ed50bb6e9fd38ac169  strace-musl.patch
+672b5b240bd79ca0b7145cda33e29d9aea4067ff78eae993062381010868a5e31d2d58fc3329dfa5dbe76f029a057710489d50ba6a104adc727f287704622125  uclibc-fix.patch"
diff --git a/main/strace/uclibc-fix.patch b/main/strace/uclibc-fix.patch
new file mode 100644
index 0000000000..1265df76ce
--- /dev/null
+++ b/main/strace/uclibc-fix.patch
@@ -0,0 +1,12 @@
+--- ./resource.c.orig	2014-03-26 10:51:41.868389136 +0000
++++ ./resource.c	2014-03-26 10:52:15.395449771 +0000
+@@ -31,7 +31,9 @@
+ #include "defs.h"
+ #include <sys/resource.h>
+ #include <sys/times.h>
++#ifndef __GLIBC__
+ #include <sys/sysinfo.h>
++#endif
+ #include <linux/kernel.h>
+ 
+ static const struct xlat resources[] = {
-- 
cgit v1.2.3