svn commit: branches/uClibc-nptl/extra: Configs config config/lxdialog

sjhill at uclibc.org sjhill at uclibc.org
Mon Aug 21 05:02:06 UTC 2006


Author: sjhill
Date: 2006-08-20 22:02:06 -0700 (Sun, 20 Aug 2006)
New Revision: 15885

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/extra/Configs/Config.in
   branches/uClibc-nptl/extra/Makefile.in
   branches/uClibc-nptl/extra/config/Makefile.in
   branches/uClibc-nptl/extra/config/lxdialog/dialog.h
   branches/uClibc-nptl/extra/config/lxdialog/inputbox.c


Changeset:
Modified: branches/uClibc-nptl/extra/Configs/Config.in
===================================================================
--- branches/uClibc-nptl/extra/Configs/Config.in	2006-08-21 04:56:08 UTC (rev 15884)
+++ branches/uClibc-nptl/extra/Configs/Config.in	2006-08-21 05:02:06 UTC (rev 15885)
@@ -18,7 +18,7 @@
 	bool "arm"
 
 config TARGET_bfin
-	bool "bfin (BROKEN)"
+	bool "bfin"
 
 config TARGET_cris
 	bool "cris"
@@ -1229,7 +1229,7 @@
 config UCLIBC_HAS_GNU_GLOB
 	bool "Support gnu glob() interface"
 	depends on UCLIBC_HAS_GLOB
-	default y
+	default n
 	help
 	  The gnu glob interface is somewhat larger (weighing in at about 4,2k) than
 	  it's SuSv3 counterpart (and is out of date). It is an old copy from glibc and
@@ -1237,7 +1237,6 @@
 
 	  Answer Y if you want to include full gnu glob() instead of the smaller SUSv3
 	  compatible glob().
-	  It is only default, because it is the old/stable version.
 
 	  Most people will answer N.
 
@@ -1437,7 +1436,6 @@
 config DODEBUG
 	bool "Build uClibc with debugging symbols"
 	default n
-	select NOSTRIP
 	select EXTRA_WARNINGS
 	help
 	  Say Y here if you wish to compile uClibc with debugging symbols.
@@ -1458,13 +1456,15 @@
 
 	  Otherwise, answer N.
 
-config NOSTRIP
-	bool "Do not build stripped libraries and executables"
-	default n
+config DOSTRIP
+	bool "Strip libraries and executables"
+	default y
+	depends on !DODEBUG
 	help
-	  Say Y here if you do not wish to strip all uClibc libraries and
-	  executables.  This increases the size of the binaries considerably.
-	  Most people will answer N.
+	  Say Y here if you do wish to strip all uClibc libraries and
+	  executables.  No stripping increases the size of the binaries
+	  considerably, but makes it possible to debug uClibc libraries.
+	  Most people will answer Y.
 
 config DOASSERTS
 	bool "Build uClibc with run-time assertion testing"

Modified: branches/uClibc-nptl/extra/Makefile.in
===================================================================
--- branches/uClibc-nptl/extra/Makefile.in	2006-08-21 04:56:08 UTC (rev 15884)
+++ branches/uClibc-nptl/extra/Makefile.in	2006-08-21 05:02:06 UTC (rev 15885)
@@ -1,7 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2005 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #

Modified: branches/uClibc-nptl/extra/config/Makefile.in
===================================================================
--- branches/uClibc-nptl/extra/config/Makefile.in	2006-08-21 04:56:08 UTC (rev 15884)
+++ branches/uClibc-nptl/extra/config/Makefile.in	2006-08-21 05:02:06 UTC (rev 15885)
@@ -124,6 +124,5 @@
 clean: config_clean
 
 config_clean:
-	$(RM) $(config_OUT)/*.o $(config_SHIPPED_SRC) $(MCONF_OBJS) $(CONF_OBJS) \
+	$(RM) $(config_OUT)/*.o $(config_OUT)/lxdialog/*.o $(config_SHIPPED_SRC) $(MCONF_OBJS) $(CONF_OBJS) \
 		conf mconf lkc_defs.h
-

Modified: branches/uClibc-nptl/extra/config/lxdialog/dialog.h
===================================================================
--- branches/uClibc-nptl/extra/config/lxdialog/dialog.h	2006-08-21 04:56:08 UTC (rev 15884)
+++ branches/uClibc-nptl/extra/config/lxdialog/dialog.h	2006-08-21 05:02:06 UTC (rev 15885)
@@ -170,7 +170,7 @@
 int dialog_checklist (const char *title, const char *prompt, int height,
 		int width, int list_height, int item_no,
 		struct dialog_list_item ** items, int flag);
-extern unsigned char dialog_input_result[];
+extern char dialog_input_result[];
 int dialog_inputbox (const char *title, const char *prompt, int height,
 		int width, const char *init);
 

Modified: branches/uClibc-nptl/extra/config/lxdialog/inputbox.c
===================================================================
--- branches/uClibc-nptl/extra/config/lxdialog/inputbox.c	2006-08-21 04:56:08 UTC (rev 15884)
+++ branches/uClibc-nptl/extra/config/lxdialog/inputbox.c	2006-08-21 05:02:06 UTC (rev 15885)
@@ -21,7 +21,7 @@
 
 #include "dialog.h"
 
-unsigned char dialog_input_result[MAX_LEN + 1];
+char dialog_input_result[MAX_LEN + 1];
 
 /*
  *  Print the termination buttons
@@ -48,7 +48,7 @@
 {
     int i, x, y, box_y, box_x, box_width;
     int input_x = 0, scroll = 0, key = 0, button = -1;
-    unsigned char *instr = dialog_input_result;
+    char *instr = dialog_input_result;
     WINDOW *dialog;
 
     /* center dialog box on screen */




More information about the uClibc-cvs mailing list