aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-10-13 14:27:01 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-10-13 14:27:53 +0000
commitfc2f04fa15db257eaf6621344afd73d15136d11b (patch)
treeee3a23fbdab7fd426f96a5d75da5ae20ec1d7871
parentd97ed5b957c8b67c87242065369a232be6c5ca40 (diff)
downloadaports-fc2f04fa15db257eaf6621344afd73d15136d11b.tar.bz2
aports-fc2f04fa15db257eaf6621344afd73d15136d11b.tar.xz
main/findutils: add missing patch
-rw-r--r--main/findutils/APKBUILD6
-rw-r--r--main/findutils/fix-gnulib-freadahead.patch38
2 files changed, 41 insertions, 3 deletions
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index ee2ed725fa..380ce22f92 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -51,8 +51,8 @@ package() {
}
md5sums="351cc4adb07d54877fa15f75fb77d39f findutils-4.4.2.tar.gz
-151400410daf15fa87944a9d51460918 fix-gnulib-freadahead.patch"
+1d96ac5e44f302e23c03bb55347e9a79 fix-gnulib-freadahead.patch"
sha256sums="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a findutils-4.4.2.tar.gz
-1ed50d784a1c1a8603f47449e8fc3c95bd39ff827a8ec8fed0ecd07330fe8844 fix-gnulib-freadahead.patch"
+4a83686438d95859ea0ed9cafa8119a7b788e3d7ef2b1eee52ee3f0391d23dc9 fix-gnulib-freadahead.patch"
sha512sums="262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 findutils-4.4.2.tar.gz
-8ed8a28ff35a30a8e07af17ca5dea1c3ad12d81bccb6dffe6727a6dd4d47943c401e26433e793ee0ea249a1a1fdd67ea8a8573f6914c636dbfb56dd5dce6884e fix-gnulib-freadahead.patch"
+86797a218ff6b4425f0c2df353b7863b521e5c08c282f6885f55b942149c32bc65e25491f156dbf3622e14d8108d508d86000dfd38c79d1302bbef91f68c9cfc fix-gnulib-freadahead.patch"
diff --git a/main/findutils/fix-gnulib-freadahead.patch b/main/findutils/fix-gnulib-freadahead.patch
new file mode 100644
index 0000000000..adcfdd4186
--- /dev/null
+++ b/main/findutils/fix-gnulib-freadahead.patch
@@ -0,0 +1,38 @@
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.c
++++ findutils-4.4.2/gnulib/lib/freadahead.c
+@@ -19,6 +19,7 @@
+ /* Specification. */
+ #include "freadahead.h"
+
++#ifndef HAVE___FREADAHEAD
+ size_t
+ freadahead (FILE *fp)
+ {
+@@ -64,3 +65,4 @@
+ #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
+ #endif
+ }
++#endif
+--- findutils-4.4.2.orig/gnulib/lib/freadahead.h
++++ findutils-4.4.2/gnulib/lib/freadahead.h
+@@ -29,7 +29,20 @@
+
+ STREAM must not be wide-character oriented. */
+
++#if HAVE___FREADAHEAD || (defined(__linux__) && !defined(__GLIBC__) && !defined(__UCLIBC__)) /* musl libc */
++
++#ifndef HAVE___FREADAHEAD
++#define HAVE___FREADAHEAD 1
++#endif
++
++# include <stdio_ext.h>
++# define freadahead(stream) __freadahead (stream)
++
++#else
++
+ extern size_t freadahead (FILE *stream);
++
++#endif
+
+ #ifdef __cplusplus
+ }