From c111f14db1b4558ebf5b2e894315c8e5217bf6fc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 16:08:36 +0100 Subject: make bulk build on Debian/lenny x86 complete - fix some menu descriptions - fix gcc package compile --- package/Config.in | 14 ++++++++----- package/alsa-lib/Config.in | 2 +- package/bison/Config.in | 2 +- package/cfinstall/Config.in | 2 +- package/curl/Config.in | 24 +--------------------- package/curl/Config.in.lib | 20 +++++++++++++++++++ package/cxxtools/Config.in | 1 + package/e2fsprogs/Config.in | 27 ------------------------- package/e2fsprogs/Config.in.lib | 28 ++++++++++++++++++++++++++ package/gcc/Makefile | 3 +-- package/gcc/patches/cross-gcc-fix.patch | 13 ++++++++++++ package/glib/Config.in | 5 +++-- package/gperf/Config.in | 2 +- package/libICE/Config.in | 2 +- package/libSM/Config.in | 2 +- package/libX11/Config.in | 2 +- package/libXau/Config.in | 2 +- package/libXaw/Config.in | 2 +- package/libXdmcp/Config.in | 2 +- package/libXext/Config.in | 2 +- package/libXfont/Config.in | 2 +- package/libXmu/Config.in | 2 +- package/libXpm/Config.in | 2 +- package/libXt/Config.in | 2 +- package/libXv/Config.in | 2 +- package/libXxf86dga/Config.in | 2 +- package/libffi/Config.in | 2 +- package/libfontenc/Config.in | 2 +- package/libpciaccess/Config.in | 2 +- package/libxkbfile/Config.in | 2 +- package/lua/Config.in | 29 ++------------------------- package/lua/Config.in.lib | 25 +++++++++++++++++++++++ package/m4/Config.in | 2 +- package/php/Config.in | 2 +- package/pixman/Config.in | 2 +- package/python/Config.in | 2 +- package/python/Makefile | 2 +- package/sqlite/Config.in | 35 --------------------------------- package/sqlite/Config.in.lib | 35 +++++++++++++++++++++++++++++++++ package/tntnet/Config.in | 1 + package/uclibc/Config.in | 3 +-- package/wget/Config.in | 2 +- package/xf86-video-geode/Config.in | 2 +- package/xf86dga/Config.in | 2 +- package/xf86dga/Makefile | 6 +++--- package/xkbcomp/Config.in | 2 +- package/xkeyboard-config/Config.in | 2 +- 47 files changed, 174 insertions(+), 157 deletions(-) create mode 100644 package/curl/Config.in.lib create mode 100644 package/e2fsprogs/Config.in.lib create mode 100644 package/gcc/patches/cross-gcc-fix.patch create mode 100644 package/lua/Config.in.lib create mode 100644 package/sqlite/Config.in.lib (limited to 'package') diff --git a/package/Config.in b/package/Config.in index 1d32edd5e..279600d87 100644 --- a/package/Config.in +++ b/package/Config.in @@ -96,6 +96,7 @@ source "package/sane-backends/Config.in" source "package/screen/Config.in" source "package/scsi-spin/Config.in" source "package/ser2net/Config.in" +source "package/sqlite/Config.in" source "package/syslog-ng/Config.in" source "package/tar/Config.in" source "package/xz/Config.in" @@ -203,6 +204,7 @@ source "package/updatedd/Config.in" endmenu menu "HTTP / FTP" +source "package/curl/Config.in" source "package/gatling/Config.in" source "package/lighttpd/Config.in" source "package/mini_httpd/Config.in" @@ -367,7 +369,6 @@ source "package/autoconf/Config.in" source "package/automake/Config.in" source "package/binutils/Config.in" source "package/bison/Config.in" -source "package/cxxtools/Config.in" source "package/diffutils/Config.in" source "package/flex/Config.in" source "package/gcc/Config.in" @@ -382,7 +383,6 @@ source "package/perl/Config.in" source "package/php/Config.in" source "package/python/Config.in" source "package/ruby/Config.in" -source "package/libffi/Config.in" source "package/tcl/Config.in" endmenu @@ -395,7 +395,9 @@ source "package/apr-util/Config.in" source "package/avahi/Config.in.lib" source "package/axtls/Config.in.lib" source "package/cgilib/Config.in" +source "package/cxxtools/Config.in" source "package/dbus/Config.in" +source "package/e2fsprogs/Config.in.lib" source "package/gettext/Config.in" source "package/glib/Config.in" source "package/id3lib/Config.in" @@ -403,12 +405,13 @@ source "package/libao/Config.in" source "package/libaudiofile/Config.in" source "package/libart/Config.in" source "package/libcli/Config.in" -source "package/curl/Config.in" # libcurl +source "package/curl/Config.in.lib" source "package/libdaemon/Config.in" source "package/libdb/Config.in" source "package/libdnet/Config.in" source "package/libelf/Config.in" source "package/libevent/Config.in" +source "package/libffi/Config.in" source "package/expat/Config.in" # libexpat source "package/faad2/Config.in" # libfaad2 source "package/flac/Config.in" # libflac @@ -455,7 +458,7 @@ source "package/libthread_db/Config.in" source "package/readline/Config.in" # libreadline source "package/cyrus-sasl/Config.in" # libsasl2 source "package/speex/Config.in" # libspeex -source "package/sqlite/Config.in" # libsqlite +source "package/sqlite/Config.in.lib" source "package/librpcsecgss/Config.in" source "package/libshout/Config.in" source "package/libsigc++/Config.in" @@ -473,6 +476,7 @@ source "package/libvorbisidec/Config.in" source "package/tcp_wrappers/Config.in" source "package/libxml2/Config.in" source "package/libxslt/Config.in" +source "package/lua/Config.in.lib" source "package/uclibc++/Config.in" source "package/ustl/Config.in" source "package/zlib/Config.in" @@ -501,7 +505,7 @@ source "package/libXpm/Config.in" source "package/libXt/Config.in" source "package/libXxf86dga/Config.in" source "package/pixman/Config.in" -source "package/xf86dga/Config.in" +#source "package/xf86dga/Config.in" source "package/xkbcomp/Config.in" source "package/xkeyboard-config/Config.in" endmenu diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index 6276ba489..fcefe3c5f 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_ALSA_LIB - prompt "alsa-lib............................ alsa library" + prompt "alsa-lib.......................... alsa library" tristate default n help diff --git a/package/bison/Config.in b/package/bison/Config.in index a78712f64..870ce4b8f 100644 --- a/package/bison/Config.in +++ b/package/bison/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_BISON - prompt "bison.............................. GNU parser generator" + prompt "bison............................. GNU parser generator" tristate default n help diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in index f02c4e809..e553d2f77 100644 --- a/package/cfinstall/Config.in +++ b/package/cfinstall/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_CFINSTALL - prompt "cfinstall........................... compact flash installer" + prompt "cfinstall............................ compact flash installer" tristate select ADK_PACKAGE_SFDISK select ADK_PACKAGE_PARTED diff --git a/package/curl/Config.in b/package/curl/Config.in index c9d34b5c8..f8b8da8e6 100644 --- a/package/curl/Config.in +++ b/package/curl/Config.in @@ -3,30 +3,8 @@ config ADK_COMPILE_CURL default n depends on ADK_PACKAGE_LIBCURL -config ADK_PACKAGE_LIBCURL - prompt "libcurl........................... A client-side URL transfer library" - tristate - default n - select ADK_COMPILE_CURL - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_ZLIB - help - http://curl.haxx.se/ - -config ADK_PACKAGE_LIBCURL_DEV - prompt "libcurl-dev....................... development files for libcurl" - tristate - default n - depends on ADK_PACKAGE_LIBCURL - select ADK_COMPILE_CURL - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_ZLIB - help - http://curl.haxx.se/ - - config ADK_PACKAGE_CURL - prompt "curl............................ A client-side URL transfer tool" + prompt "curl.............................. A client-side URL transfer tool" tristate default n depends on ADK_PACKAGE_LIBCURL diff --git a/package/curl/Config.in.lib b/package/curl/Config.in.lib new file mode 100644 index 000000000..1e49d8521 --- /dev/null +++ b/package/curl/Config.in.lib @@ -0,0 +1,20 @@ +config ADK_PACKAGE_LIBCURL + prompt "libcurl........................... A client-side URL transfer library" + tristate + default n + select ADK_COMPILE_CURL + select ADK_PACKAGE_LIBOPENSSL + select ADK_PACKAGE_ZLIB + help + http://curl.haxx.se/ + +config ADK_PACKAGE_LIBCURL_DEV + prompt "libcurl-dev....................... development files for libcurl" + tristate + default n + select ADK_COMPILE_CURL + select ADK_PACKAGE_LIBOPENSSL + select ADK_PACKAGE_ZLIB + help + http://curl.haxx.se/ + diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index 5c040b674..566d2e6cb 100644 --- a/package/cxxtools/Config.in +++ b/package/cxxtools/Config.in @@ -21,6 +21,7 @@ config ADK_COMPILE_CXXTOOLS_WITH_STDCXX config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in index 4f80a07dc..2c0b4da90 100644 --- a/package/e2fsprogs/Config.in +++ b/package/e2fsprogs/Config.in @@ -13,30 +13,3 @@ config ADK_PACKAGE_E2FSPROGS http://e2fsprogs.sourceforge.net/ -config ADK_PACKAGE_LIBUUID - prompt "libuuid......................... UUID library" - depends on ADK_PACKAGE_E2FSPROGS - tristate - default n - help - -config ADK_PACKAGE_LIBBLKID - prompt "libblkid........................ BlockID library" - depends on ADK_PACKAGE_E2FSPROGS - tristate - default n - help - -config ADK_PACKAGE_LIBCOM_ERR - prompt "libcom_err...................... Common error library" - depends on ADK_PACKAGE_E2FSPROGS - tristate - default n - help - -config ADK_PACKAGE_LIBSS - prompt "libss........................... Subsystem command parsing library" - depends on ADK_PACKAGE_E2FSPROGS - tristate - default n - help diff --git a/package/e2fsprogs/Config.in.lib b/package/e2fsprogs/Config.in.lib new file mode 100644 index 000000000..23630894f --- /dev/null +++ b/package/e2fsprogs/Config.in.lib @@ -0,0 +1,28 @@ +config ADK_PACKAGE_LIBUUID + prompt "libuuid......................... UUID library" + depends on ADK_PACKAGE_E2FSPROGS + tristate + default n + help + +config ADK_PACKAGE_LIBBLKID + prompt "libblkid........................ BlockID library" + depends on ADK_PACKAGE_E2FSPROGS + tristate + default n + help + +config ADK_PACKAGE_LIBCOM_ERR + prompt "libcom_err...................... Common error library" + depends on ADK_PACKAGE_E2FSPROGS + tristate + default n + help + +config ADK_PACKAGE_LIBSS + prompt "libss........................... Subsystem command parsing library" + depends on ADK_PACKAGE_E2FSPROGS + tristate + default n + help + diff --git a/package/gcc/Makefile b/package/gcc/Makefile index cbd9ee0db..b2f6266ef 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -15,11 +15,10 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS}, TCFLAGS:= '' TCPPFLAGS:= '' -CONFIGURE_STYLE= gnu +CONFIGURE_STYLE:= gnu ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y) CONFIGURE_ARGS+= --with-abi=64 endif -CONFIGURE_ENV+= ac_cv_func_fputc_unlocked=no CONFIGURE_ARGS+= --enable-languages=c,c++ \ --libexecdir=/usr/lib \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/gcc/patches/cross-gcc-fix.patch b/package/gcc/patches/cross-gcc-fix.patch new file mode 100644 index 000000000..9b5d55318 --- /dev/null +++ b/package/gcc/patches/cross-gcc-fix.patch @@ -0,0 +1,13 @@ +diff -Nur gcc-4.4.2.orig/gcc/Makefile.in gcc-4.4.2/gcc/Makefile.in +--- gcc-4.4.2.orig/gcc/Makefile.in 2009-07-25 19:53:35.000000000 +0200 ++++ gcc-4.4.2/gcc/Makefile.in 2009-11-22 15:30:27.000000000 +0100 +@@ -898,7 +898,8 @@ + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always + # win against random include files in /usr/include. +-ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) ++#ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) ++ALL_CPPFLAGS = $(INCLUDES) + + # Build and host support libraries. + LIBIBERTY = ../libiberty/libiberty.a diff --git a/package/glib/Config.in b/package/glib/Config.in index 093e19649..e23dde160 100644 --- a/package/glib/Config.in +++ b/package/glib/Config.in @@ -1,7 +1,8 @@ config ADK_PACKAGE_GLIB - prompt "glib............................. low-level core library that forms the basis of GTK+" + prompt "glib.............................. low-level core library that forms the basis of GTK+" tristate - default n select ADK_PACKAGE_LIBPTHREAD select ADK_PACKAGE_LIBICONV select ADK_PACKAGE_GETTEXT + default n + help diff --git a/package/gperf/Config.in b/package/gperf/Config.in index 6e5368708..d19d3ca18 100644 --- a/package/gperf/Config.in +++ b/package/gperf/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_GPERF - prompt "gperf.............................. perfect hash function generator" + prompt "gperf............................. perfect hash function generator" tristate default n select ADK_PACKAGE_LIBSTDCXX diff --git a/package/libICE/Config.in b/package/libICE/Config.in index 446b50b31..e2ce3dc41 100644 --- a/package/libICE/Config.in +++ b/package/libICE/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBICE - prompt "libICE.................................. X library" + prompt "libICE............................... Inter-Client Exchange library" tristate default n help diff --git a/package/libSM/Config.in b/package/libSM/Config.in index e247147ee..638ab0d74 100644 --- a/package/libSM/Config.in +++ b/package/libSM/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBSM - prompt "libSM................................... X library" + prompt "libSM................................ X11 Session Management library" tristate default n select ADK_PACKAGE_LIBUUID diff --git a/package/libX11/Config.in b/package/libX11/Config.in index d83aa266d..d14680a8e 100644 --- a/package/libX11/Config.in +++ b/package/libX11/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBX11 - prompt "libX11................................. X library" + prompt "libX11............................... X11 client-side library" tristate select ADK_PACKAGE_LIBXDMCP default n diff --git a/package/libXau/Config.in b/package/libXau/Config.in index 682e225e7..8d40e7992 100644 --- a/package/libXau/Config.in +++ b/package/libXau/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXAU - prompt "libXau................................. X library" + prompt "libXau............................... X11 authorisation library" tristate default n help diff --git a/package/libXaw/Config.in b/package/libXaw/Config.in index 713a26ab9..172b70b14 100644 --- a/package/libXaw/Config.in +++ b/package/libXaw/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXAW - prompt "libXaw................................. X library" + prompt "libXaw............................... X11 Athena Widget library" tristate default n help diff --git a/package/libXdmcp/Config.in b/package/libXdmcp/Config.in index a62285364..acfbce8b9 100644 --- a/package/libXdmcp/Config.in +++ b/package/libXdmcp/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXDMCP - prompt "libXdmcp............................... X library" + prompt "libXdmcp............................. X11 display manager control protocol library" tristate default n help diff --git a/package/libXext/Config.in b/package/libXext/Config.in index 1110918f5..f687e82f5 100644 --- a/package/libXext/Config.in +++ b/package/libXext/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXEXT - prompt "libXext................................. X library" + prompt "libXext.............................. X client interface to extensions of the X protocol" tristate default n help diff --git a/package/libXfont/Config.in b/package/libXfont/Config.in index b8553405a..06738e361 100644 --- a/package/libXfont/Config.in +++ b/package/libXfont/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXFONT - prompt "libxfont................................ X font library" + prompt "libxfont............................. X font library" tristate default n select ADK_PACKAGE_LIBFREETYPE diff --git a/package/libXmu/Config.in b/package/libXmu/Config.in index 99cf0d08e..90a958133 100644 --- a/package/libXmu/Config.in +++ b/package/libXmu/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXMU - prompt "libXmu................................. X library" + prompt "libXmu............................... miscellaneous utility functions for X libraries" tristate default n help diff --git a/package/libXpm/Config.in b/package/libXpm/Config.in index 8fc79245a..7e5736d97 100644 --- a/package/libXpm/Config.in +++ b/package/libXpm/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXPM - prompt "libXpm................................. X library" + prompt "libXpm............................... common operation for the XPM pixmap format" tristate default n help diff --git a/package/libXt/Config.in b/package/libXt/Config.in index b1c4a76f3..7e7488cea 100644 --- a/package/libXt/Config.in +++ b/package/libXt/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXT - prompt "libXt................................... X library" + prompt "libXt................................ X Toolkit Intrinsics" tristate default n help diff --git a/package/libXv/Config.in b/package/libXv/Config.in index 59cf46b96..53ac67a19 100644 --- a/package/libXv/Config.in +++ b/package/libXv/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXV - prompt "libXv................................. X library" + prompt "libXv................................ X11 Xvideo extensions" tristate default n help diff --git a/package/libXxf86dga/Config.in b/package/libXxf86dga/Config.in index 3c4a0c313..c28f5e7b6 100644 --- a/package/libXxf86dga/Config.in +++ b/package/libXxf86dga/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXXF86DGA - prompt "libXxf86dga................................. X library" + prompt "libXxf86dga.......................... client library for the XFree86-DGA extension" tristate default n help diff --git a/package/libffi/Config.in b/package/libffi/Config.in index 2186062ad..86dbc07eb 100644 --- a/package/libffi/Config.in +++ b/package/libffi/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBFFI - prompt "libffi.......................... Foreign Function Interface library" + prompt "libffi............................ Foreign Function Interface library" tristate default n help diff --git a/package/libfontenc/Config.in b/package/libfontenc/Config.in index 966bd7d22..8aa38029e 100644 --- a/package/libfontenc/Config.in +++ b/package/libfontenc/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBFONTENC - prompt "libfontenc.............................. X font encoding library" + prompt "libfontenc........................... X font encoding library" tristate select ADK_PACKAGE_ZLIB default n diff --git a/package/libpciaccess/Config.in b/package/libpciaccess/Config.in index 7f8c03c54..75e979fab 100644 --- a/package/libpciaccess/Config.in +++ b/package/libpciaccess/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBPCIACCESS - prompt "libpciaccess.......................... PCI access library" + prompt "libpciaccess......................... PCI access library" tristate default n help diff --git a/package/libxkbfile/Config.in b/package/libxkbfile/Config.in index 9b6adea78..6286ce808 100644 --- a/package/libxkbfile/Config.in +++ b/package/libxkbfile/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_LIBXKBFILE - prompt "libxkbfile.............................. X keyboard library" + prompt "libxkbfile........................... X keyboard library" tristate default n help diff --git a/package/lua/Config.in b/package/lua/Config.in index 580d82217..8605c3b20 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -1,35 +1,10 @@ -#menu "lua............................... LUA programming language" +menu "lua............................... LUA programming language" config ADK_COMPILE_LUA tristate default n depends on ADK_PACKAGE_LIBLUA -config ADK_PACKAGE_LIBLUA - prompt "liblua............................ LUA programming language shared libraries" - tristate - select ADK_COMPILE_LUA - help - Lua is a powerful light-weight programming language designed for extending - applications. Lua is also frequently used as a general-purpose, stand-alone - language. Lua is free software. - - Lua combines simple procedural syntax with powerful data description - constructs based on associative arrays and extensible semantics. Lua is - dynamically typed, interpreted from bytecodes, and has automatic memory - management with garbage collection, making it ideal for configuration, - scripting, and rapid prototyping. - - Lua is implemented as a small library of C functions, written in ANSI C, and - compiles unmodified in all known platforms. The implementation goals are - simplicity, efficiency, portability, and low embedding cost. The result is a - fast language engine with small footprint, making it ideal in embedded systems - too. - - http://www.lua.org/ - - This package contains the LUA shared libraries, needed by other programs. - config ADK_PACKAGE_LUA prompt "lua............................... LUA programming language interpreter" tristate @@ -108,4 +83,4 @@ config ADK_PACKAGE_LUA_EXAMPLES This package contains LUA language examples. -#endmenu +endmenu diff --git a/package/lua/Config.in.lib b/package/lua/Config.in.lib new file mode 100644 index 000000000..102d57d70 --- /dev/null +++ b/package/lua/Config.in.lib @@ -0,0 +1,25 @@ +config ADK_PACKAGE_LIBLUA + prompt "liblua............................ LUA programming language shared libraries" + tristate + select ADK_COMPILE_LUA + help + Lua is a powerful light-weight programming language designed for extending + applications. Lua is also frequently used as a general-purpose, stand-alone + language. Lua is free software. + + Lua combines simple procedural syntax with powerful data description + constructs based on associative arrays and extensible semantics. Lua is + dynamically typed, interpreted from bytecodes, and has automatic memory + management with garbage collection, making it ideal for configuration, + scripting, and rapid prototyping. + + Lua is implemented as a small library of C functions, written in ANSI C, and + compiles unmodified in all known platforms. The implementation goals are + simplicity, efficiency, portability, and low embedding cost. The result is a + fast language engine with small footprint, making it ideal in embedded systems + too. + + http://www.lua.org/ + + This package contains the LUA shared libraries, needed by other programs. + diff --git a/package/m4/Config.in b/package/m4/Config.in index 426c772f6..d929668ef 100644 --- a/package/m4/Config.in +++ b/package/m4/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_M4 - prompt "m4.............................. macro processor" + prompt "m4................................ macro processor" tristate default n help diff --git a/package/php/Config.in b/package/php/Config.in index 57ab1f333..ec9b30a12 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,4 +1,4 @@ -menu "php.............................. PHP Hypertext preprocessor" +menu "php............................... PHP Hypertext preprocessor" config ADK_COMPILE_PHP prompt "php.............................. PHP Hypertext preprocessor" diff --git a/package/pixman/Config.in b/package/pixman/Config.in index 62967ef3e..266820e19 100644 --- a/package/pixman/Config.in +++ b/package/pixman/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_PIXMAN - prompt "pixman.............................. pixman library" + prompt "pixman............................... pixman library" tristate default n help diff --git a/package/python/Config.in b/package/python/Config.in index 321f8c59c..ddbd30d9c 100644 --- a/package/python/Config.in +++ b/package/python/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_PYTHON - prompt "python........................... Python scripting language" + prompt "python............................ Python scripting language" tristate default n help diff --git a/package/python/Makefile b/package/python/Makefile index d80b3a05a..7d087dd1d 100644 --- a/package/python/Makefile +++ b/package/python/Makefile @@ -42,7 +42,7 @@ pre-configure: ); $(MAKE) -C ${WRKBUILD} python Parser/pgen ${CP} ${WRKBUILD}/Parser/pgen ${STAGING_TOOLS}/bin/pgen - ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/python + ${CP} ${WRKBUILD}/python ${STAGING_TOOLS}/bin/hostpython ${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen ${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython $(MAKE) -C ${WRKBUILD} distclean diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 870f02c82..d436ebb39 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -3,41 +3,6 @@ config ADK_COMPILE_SQLITE default n depends on ADK_PACKAGE_LIBSQLITE -config ADK_PACKAGE_LIBSQLITE - prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine" - tristate - default n - select ADK_COMPILE_SQLITE - select ADK_PACKAGE_LIBNCURSES - select ADK_PACKAGE_LIBREADLINE - help - SQLite is a small C library that implements a self-contained, embeddable, - zero-configuration SQL database engine. Features include: - - * Transactions are atomic, consistent, isolated, and durable (ACID) - even after system crashes and power failures. - * Zero-configuration - no setup or administration needed. - * Implements most of SQL92. (Features not supported) - * A complete database is stored in a single disk file. - * Database files can be freely shared between machines with different - byte orders. - * Supports databases up to 2 terabytes (241 bytes) in size. - * Sizes of strings and BLOBs limited only by available memory. - * Small code footprint: less than 30K lines of C code, less than 250KB - code space (gcc on i486) - * Faster than popular client/server database engines for most common - operations. - * Simple, easy to use API. - * TCL bindings included. Bindings for many other languages available - separately. - * Well-commented source code with over 95% test coverage. - * Self-contained: no external dependencies. - * Sources are in the public domain. Use for any purpose. - - http://www.sqlite.org/ - - This package contains the shared library, needed by other programs. - config ADK_PACKAGE_SQLITE_CLI prompt "sqlite-cli...................... Command line interface for SQLite" tristate diff --git a/package/sqlite/Config.in.lib b/package/sqlite/Config.in.lib new file mode 100644 index 000000000..98d55f421 --- /dev/null +++ b/package/sqlite/Config.in.lib @@ -0,0 +1,35 @@ +config ADK_PACKAGE_LIBSQLITE + prompt "libsqlite......................... Self-contained, embeddable, zero-configuration SQL database engine" + tristate + default n + select ADK_COMPILE_SQLITE + select ADK_PACKAGE_LIBNCURSES + select ADK_PACKAGE_LIBREADLINE + help + SQLite is a small C library that implements a self-contained, embeddable, + zero-configuration SQL database engine. Features include: + + * Transactions are atomic, consistent, isolated, and durable (ACID) + even after system crashes and power failures. + * Zero-configuration - no setup or administration needed. + * Implements most of SQL92. (Features not supported) + * A complete database is stored in a single disk file. + * Database files can be freely shared between machines with different + byte orders. + * Supports databases up to 2 terabytes (241 bytes) in size. + * Sizes of strings and BLOBs limited only by available memory. + * Small code footprint: less than 30K lines of C code, less than 250KB + code space (gcc on i486) + * Faster than popular client/server database engines for most common + operations. + * Simple, easy to use API. + * TCL bindings included. Bindings for many other languages available + separately. + * Well-commented source code with over 95% test coverage. + * Self-contained: no external dependencies. + * Sources are in the public domain. Use for any purpose. + + http://www.sqlite.org/ + + This package contains the shared library, needed by other programs. + diff --git a/package/tntnet/Config.in b/package/tntnet/Config.in index 02fecc301..ca1d4f669 100644 --- a/package/tntnet/Config.in +++ b/package/tntnet/Config.in @@ -50,6 +50,7 @@ config ADK_COMPILE_TNTNET_WITH_STDCXX config ADK_COMPILE_TNTNET_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index a90c7c22b..8cc828864 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -8,11 +8,10 @@ config ADK_PACKAGE_UCLIBC Embedded C library. config ADK_PACKAGE_UCLIBC_DEV - prompt "uclibc-dev........................... development files" + prompt "uClibc-dev........................... development files" bool default n depends on ADK_TARGET_LIB_UCLIBC help C library header files. - diff --git a/package/wget/Config.in b/package/wget/Config.in index 633650546..88c1d19e4 100644 --- a/package/wget/Config.in +++ b/package/wget/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_WGET - prompt "wget............................. retrieving files using HTTP, HTTPS and FTP" + prompt "wget.............................. retrieving files using HTTP, HTTPS and FTP" tristate default n help diff --git a/package/xf86-video-geode/Config.in b/package/xf86-video-geode/Config.in index ca59cab42..d63660fc8 100644 --- a/package/xf86-video-geode/Config.in +++ b/package/xf86-video-geode/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_XF86_VIDEO_GEODE - prompt "xf86-video-geode........................... X11 driver for AMD Geode" + prompt "xf86-video-geode.......................... X11 driver for AMD Geode" tristate default n depends on ADK_LINUX_X86_ALIX1C diff --git a/package/xf86dga/Config.in b/package/xf86dga/Config.in index f5a0a936b..551ab02cc 100644 --- a/package/xf86dga/Config.in +++ b/package/xf86dga/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_XF86DGA - prompt "xf86dga................................ X library" + prompt "xf86dga.............................. X library" tristate default n help diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile index cdb417476..70e0d5e39 100644 --- a/package/xf86dga/Makefile +++ b/package/xf86dga/Makefile @@ -11,8 +11,8 @@ PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -CONFIGURE_STYLE= gnu -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkbcomp/Config.in b/package/xkbcomp/Config.in index f71cf8268..1f8d81a0b 100644 --- a/package/xkbcomp/Config.in +++ b/package/xkbcomp/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_XKBCOMP - prompt "xkbcomp........................... X11 keyboard compiler" + prompt "xkbcomp.............................. X11 keyboard compiler" tristate default n help diff --git a/package/xkeyboard-config/Config.in b/package/xkeyboard-config/Config.in index 2abb16055..053cbaecf 100644 --- a/package/xkeyboard-config/Config.in +++ b/package/xkeyboard-config/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_XKEYBOARD_CONFIG - prompt "xkeyboard-config............................ X keyboard config" + prompt "xkeyboard-config..................... X keyboard config" tristate default n help -- cgit v1.2.3