summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 19:14:34 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2007-04-16 19:14:34 +0000
commitc23fcc8e2e10db0203083217300982aad04739a1 (patch)
tree7f1a53b9622c9c5f7b40decd4317d8487926aaef
parent4d31bf346be1fc35872101ae38eb04e3d92796ed (diff)
- uclibc is nowadays identified via __UCLIBC__
- fix build error when no ftw() is available.
-rw-r--r--package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch b/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
new file mode 100644
index 000000000..9269e383c
--- /dev/null
+++ b/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
@@ -0,0 +1,24 @@
+diff -rdup mdadm-2.6.1.orig/mdadm.h mdadm-2.6.1/mdadm.h
+--- mdadm-2.6.1.orig/mdadm.h 2007-02-22 04:59:28.000000000 +0100
++++ mdadm-2.6.1/mdadm.h 2007-04-16 20:53:53.000000000 +0200
+@@ -382,7 +382,7 @@ struct stat64;
+ #define HAVE_NFTW we assume
+ #define HAVE_FTW
+
+-#ifdef UCLIBC
++#if defined __UCLIBC__ || /* older did use that? */ defined UCLIBC
+ # include <features.h>
+ # ifndef __UCLIBC_HAS_FTW__
+ # undef HAVE_FTW
+diff -rdup mdadm-2.6.1.orig/util.c mdadm-2.6.1/util.c
+--- mdadm-2.6.1.orig/util.c 2006-12-19 03:35:27.000000000 +0100
++++ mdadm-2.6.1/util.c 2007-04-16 21:05:56.000000000 +0200
+@@ -468,7 +468,7 @@ int nftw(const char *path, int (*han)(co
+ return ftw(path, add_dev_1, nopenfd);
+ }
+ #else
+-int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s)
++int add_dev_1(const char *name, const struct stat *stb, int flag, struct FTW *s)
+ {
+ return 0;
+ }