From 559f6b32a41c0f2a8f90cb1a70d4f94c5aabb42b Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 5 Apr 2012 21:34:24 +0000 Subject: Add patch to build kconfig-frontends under Cygwin git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4561 42af7a65-404d-4744-a932-0658087f49c3 --- misc/tools/README.txt | 44 +++++++++++++ misc/tools/kconfig-frontends-3.3.0-1-libintl.patch | 73 +++++++++++++++++++++ misc/tools/kconfig-frontends-3.3.0-1.tar.gz | Bin 0 -> 504640 bytes misc/tools/kconfig-frontends-3.3.0-1.tar.xz | Bin 317488 -> 0 bytes 4 files changed, 117 insertions(+) create mode 100644 misc/tools/README.txt create mode 100644 misc/tools/kconfig-frontends-3.3.0-1-libintl.patch create mode 100644 misc/tools/kconfig-frontends-3.3.0-1.tar.gz delete mode 100755 misc/tools/kconfig-frontends-3.3.0-1.tar.xz (limited to 'misc') diff --git a/misc/tools/README.txt b/misc/tools/README.txt new file mode 100644 index 000000000..09a14c73f --- /dev/null +++ b/misc/tools/README.txt @@ -0,0 +1,44 @@ +misc/tools/README.txt +===================== + +genromfs-0.5.2.tar.gz + + This is a snapshot of the genromfs tarball taken from + http://sourceforge.net/projects/romfs/. This snapshot is provided to + assure that a working version of genromfs is always available for NuttX. + + This tool is also include in the buildroot and can be built automatically + from the buildroot. + +kconfig-frontends-3.3.0-1.tar.gz + + This is a snapshot of the kconfig-frontends tarball taken from + http://ymorin.is-a-geek.org/projects/kconfig-frontends on April 5, 2012. + This snapshot is provided so that a working version of the mconf + utility is always available. + + General build instructions: + + ./configure + make + make install + + To suppress the graphical interfaces: + + ./configure --disable-gconf --disable-qconf + make + make install + +kconfig-frontends-3.3.0-1-libintl.patch + + The above build instructions did not work for me under my Cygwin + installation. This patch is a awful hack but will successfully + build 'mconf' under Cygwin. + + cat kconfig-frontends-3.3.0-1-libintl.patch | patch -p0 + cd kconfig-frontends-3.3.0-1 + ./configure --disable-gconf --disable-qconf + make + make install + + \ No newline at end of file diff --git a/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch new file mode 100644 index 000000000..28b4b052a --- /dev/null +++ b/misc/tools/kconfig-frontends-3.3.0-1-libintl.patch @@ -0,0 +1,73 @@ +diff -ru kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c kconfig-frontends-3.3.0-1/frontends/nconf/nconf.c +--- kconfig-frontends-3.3.0-1.orig//frontends/nconf/nconf.c 2012-03-20 16:07:45.000000000 -0600 ++++ kconfig-frontends-3.3.0-1/frontends/nconf/nconf.c 2012-04-05 15:16:06.590563200 -0600 +@@ -1503,7 +1503,7 @@ + } + + notimeout(stdscr, FALSE); +- ESCDELAY = 1; ++ //ESCDELAY = 1; + + /* set btns menu */ + curses_menu = new_menu(curses_menu_items); +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 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -ru kconfig-frontends-3.3.0-1.orig//libs/lxdialog/dialog.h kconfig-frontends-3.3.0-1/libs/lxdialog/dialog.h +--- kconfig-frontends-3.3.0-1.orig//libs/lxdialog/dialog.h 2012-03-20 16:07:45.000000000 -0600 ++++ kconfig-frontends-3.3.0-1/libs/lxdialog/dialog.h 2012-04-05 14:58:35.010416300 -0600 +@@ -26,11 +26,7 @@ + #include + #include + +-#ifndef KBUILD_NO_NLS +-# include +-#else + # define gettext(Msgid) ((const char *) (Msgid)) +-#endif + + #ifdef __sun__ + #define CURS_MACROS +diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h kconfig-frontends-3.3.0-1/libs/parser/lkc.h +--- kconfig-frontends-3.3.0-1.orig//libs/parser/lkc.h 2012-03-20 16:07:45.000000000 -0600 ++++ kconfig-frontends-3.3.0-1/libs/parser/lkc.h 2012-04-05 14:59:02.969015400 -0600 +@@ -8,14 +8,10 @@ + + #include "expr.h" + +-#ifndef KBUILD_NO_NLS +-# include +-#else + static inline const char *gettext(const char *txt) { return txt; } + static inline void textdomain(const char *domainname) {} + static inline void bindtextdomain(const char *name, const char *dir) {} + static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; } +-#endif + + #ifdef __cplusplus + extern "C" { +diff -ru kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c kconfig-frontends-3.3.0-1/libs/parser/yconf.c +--- kconfig-frontends-3.3.0-1.orig//libs/parser/yconf.c 2012-03-22 16:34:21.000000000 -0600 ++++ kconfig-frontends-3.3.0-1/libs/parser/yconf.c 2012-04-05 14:59:40.732175300 -0600 +@@ -285,12 +285,6 @@ + #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + + #ifndef YY_ +-# if YYENABLE_NLS +-# if ENABLE_NLS +-# include /* INFRINGES ON USER NAME SPACE */ +-# define YY_(msgid) dgettext ("bison-runtime", msgid) +-# endif +-# endif + # ifndef YY_ + # define YY_(msgid) msgid + # endif diff --git a/misc/tools/kconfig-frontends-3.3.0-1.tar.gz b/misc/tools/kconfig-frontends-3.3.0-1.tar.gz new file mode 100644 index 000000000..2f2f4eb9c Binary files /dev/null and b/misc/tools/kconfig-frontends-3.3.0-1.tar.gz differ diff --git a/misc/tools/kconfig-frontends-3.3.0-1.tar.xz b/misc/tools/kconfig-frontends-3.3.0-1.tar.xz deleted file mode 100755 index ffe30991e..000000000 Binary files a/misc/tools/kconfig-frontends-3.3.0-1.tar.xz and /dev/null differ -- cgit v1.2.3