summaryrefslogtreecommitdiffstats
path: root/misc/tools
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-04-14 13:31:14 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-04-14 13:31:14 +0000
commitae481369d0d0b08392e43b30db9d66afccb0bc46 (patch)
tree50b3cbe2b4c9f095885f6bfa4454ff0ac45d8768 /misc/tools
parent30eaf863737ff8e69c6e05235534470f18a966ea (diff)
Kconfig updates
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4606 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'misc/tools')
-rw-r--r--misc/tools/README.txt4
-rw-r--r--misc/tools/kconfig-frontends-3.3.0-1-libintl.patch3
-rwxr-xr-xmisc/tools/kconfig-macos.diff22
3 files changed, 26 insertions, 3 deletions
diff --git a/misc/tools/README.txt b/misc/tools/README.txt
index 09a14c73f3..ebda8b160a 100644
--- a/misc/tools/README.txt
+++ b/misc/tools/README.txt
@@ -41,4 +41,6 @@ kconfig-frontends-3.3.0-1-libintl.patch
make
make install
- \ No newline at end of file
+kconfig-macos.path
+
+ This is a patch to make the kconfig-frontends build on Mac OS X.
diff --git a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
index 28b4b052ac..3fe3f81630 100644
--- a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
+++ b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch
@@ -13,12 +13,11 @@ diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c kconfig-fronten
diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h
--- kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.h 2012-03-20 16:07:45.000000000 -0600
+++ kconfig-frontends-3.3.0-1/frontends/nconf/nconf.h 2012-04-05 15:13:36.189960800 -0600
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,6 @@
#include <string.h>
#include <unistd.h>
#include <locale.h>
-#include <curses.h>
-+#include <ncurses/curses.h>
#include <menu.h>
#include <panel.h>
#include <form.h>
diff --git a/misc/tools/kconfig-macos.diff b/misc/tools/kconfig-macos.diff
new file mode 100755
index 0000000000..10e21bb859
--- /dev/null
+++ b/misc/tools/kconfig-macos.diff
@@ -0,0 +1,22 @@
+diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c kconfig-frontends-3.3.0-1/libs/parser/yconf.c
+--- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.c 2012-04-13 23:37:32.000000000 -0700
++++ kconfig-frontends-3.3.0-1/libs/parser/yconf.c 2012-04-13 23:38:36.000000000 -0700
+@@ -87,6 +87,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stddef.h>
+
+ #include "lkc.h"
+
+diff -ru orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y kconfig-frontends-3.3.0-1/libs/parser/yconf.y
+--- orig/kconfig-frontends-3.3.0-1/libs/parser/yconf.y 2012-03-20 15:07:45.000000000 -0700
++++ kconfig-frontends-3.3.0-1/libs/parser/yconf.y 2012-04-13 23:38:22.000000000 -0700
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stddef.h>
+
+ #include "lkc.h"
+