diff options
| -rw-r--r-- | rules/alsa-utils.in | 2 | ||||
| -rw-r--r-- | rules/apache2.in | 2 | ||||
| -rw-r--r-- | rules/bash.in | 2 | ||||
| -rw-r--r-- | rules/bash.make | 2 | ||||
| -rw-r--r-- | rules/busybox.in | 2 | ||||
| -rw-r--r-- | rules/cvs.in | 4 | ||||
| -rw-r--r-- | rules/cyclictest.in | 4 | ||||
| -rw-r--r-- | rules/dropbear.in | 2 | ||||
| -rw-r--r-- | rules/gdb.in | 4 | ||||
| -rw-r--r-- | rules/gdbserver.in | 2 | ||||
| -rw-r--r-- | rules/gettext-dummy.make | 49 | ||||
| -rw-r--r-- | rules/glibc.in | 7 | ||||
| -rw-r--r-- | rules/gmake.in | 4 | ||||
| -rw-r--r-- | rules/initng.in | 2 | ||||
| -rw-r--r-- | rules/mc.in | 2 | ||||
| -rw-r--r-- | rules/mplayer.in | 2 | ||||
| -rw-r--r-- | rules/portmap.in | 2 | ||||
| -rw-r--r-- | rules/python.in | 4 | ||||
| -rw-r--r-- | rules/python24.in | 8 | ||||
| -rw-r--r-- | rules/samba.in | 5 | ||||
| -rw-r--r-- | rules/syslogng.in | 1 | ||||
| -rw-r--r-- | rules/xorg-server.in | 2 |
22 files changed, 35 insertions, 79 deletions
diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in index 260c8cf70..d1eb453b3 100644 --- a/rules/alsa-utils.in +++ b/rules/alsa-utils.in @@ -8,7 +8,7 @@ config ALSA_UTILS select ALSA_LIB_PCM select ALSA_LIB_RAWMIDI select ALSA_LIB_SEQ - select GLIBC_PTHREAD + select LIBC_PTHREAD help Some utils to handle the Advanced Linux Sound Architecture. With these utils you can control your sound device, for diff --git a/rules/apache2.in b/rules/apache2.in index 42a44139d..1d89733a6 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -3,7 +3,7 @@ menuconfig APACHE2 bool "Apache 2 HTTP Server" select EXPAT - select GLIBC_LIBRT + select LIBC_RT select HOST_APACHE2 help Apache v2 is the next generation of the Apache web server. diff --git a/rules/bash.in b/rules/bash.in index cbf5cd01d..58fb5c877 100644 --- a/rules/bash.in +++ b/rules/bash.in @@ -1,6 +1,6 @@ menuconfig BASH bool "Bash " - select GLIBC_DL + select LIBC_DL help The GNU Bourne Again SHell Bash is an sh-compatible command language interpreter that executes diff --git a/rules/bash.make b/rules/bash.make index 2281c44cf..316332340 100644 --- a/rules/bash.make +++ b/rules/bash.make @@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_BASH) += bash # # Paths and names # -BASH_VERSION = 3.1 +BASH_VERSION = 3.2 BASH = bash-$(BASH_VERSION) BASH_URL = $(PTXCONF_SETUP_GNUMIRROR)/bash/$(BASH).tar.gz BASH_SOURCE = $(SRCDIR)/$(BASH).tar.gz diff --git a/rules/busybox.in b/rules/busybox.in index 97fbb13ba..879ebd3af 100644 --- a/rules/busybox.in +++ b/rules/busybox.in @@ -3,7 +3,7 @@ menu "BusyBox " config BUSYBOX bool prompt "Busybox" - select GLIBC_LIBM if BB_CONFIG_FEATURE_AWK_MATH + select LIBC_M if BB_CONFIG_FEATURE_AWK_MATH help BusyBox is the Swiss Army Knife of embedded Linux. It is a multi call program which hosts nearly all important unix diff --git a/rules/cvs.in b/rules/cvs.in index fc65c578d..d168e582e 100644 --- a/rules/cvs.in +++ b/rules/cvs.in @@ -8,8 +8,8 @@ menuconfig CVS # ptxdist patch remove it. # select ZLIB - select GLIBC_CRYPT - select GLIBC_NSL + select LIBC_CRYPT + select LIBC_NSL prompt "cvs " help CVS is the Concurrent Versions System. This is a version control system diff --git a/rules/cyclictest.in b/rules/cyclictest.in index 661bc02b7..530330f9e 100644 --- a/rules/cyclictest.in +++ b/rules/cyclictest.in @@ -1,8 +1,8 @@ config CYCLICTEST bool prompt "cyclictest " - select GLIBC_PTHREAD - select GLIBC_LIBRT + select LIBC_PTHREAD + select LIBC_RT help cyclictest is a testprogram for high resolution timers. diff --git a/rules/dropbear.in b/rules/dropbear.in index 7c4700595..5374912fe 100644 --- a/rules/dropbear.in +++ b/rules/dropbear.in @@ -2,7 +2,7 @@ menuconfig DROPBEAR bool prompt "Dropbear SSH-Server " select ZLIB - select GLIBC_UTIL + select LIBC_UTIL help dropbear is a SSH 2 server and client designed to be small enough to be used in small memory diff --git a/rules/gdb.in b/rules/gdb.in index fd1a8cbff..7663cef8b 100644 --- a/rules/gdb.in +++ b/rules/gdb.in @@ -5,16 +5,14 @@ source "rules/gdbserver.in" menuconfig GDB bool prompt "gdb (the real one) " - select GLIBC_LIBM if (GLIBC && GLIBC_INSTALL && GDB_SHARED) select TERMCAP if GDB_TERMCAP select NCURSES if GDB_NCURSES - # FIXME: this does not work, the script creates dependencies for - # both libraries! (rsc) config GDB_SHARED bool "Build shared" default y depends on GDB + select LIBC_M help If not set, the build option LDFLAGS=-static will be activated. diff --git a/rules/gdbserver.in b/rules/gdbserver.in index c0a50354c..a90fa1c4f 100644 --- a/rules/gdbserver.in +++ b/rules/gdbserver.in @@ -10,7 +10,7 @@ config GDBSERVER_SHARED bool "shared gdbserver" default y depends on GDBSERVER - select GLIBC_THREAD_DB if GLIBC && GLIBC_INSTALL + select LIBC_THREAD_DB help If not set, the build option LDFLAGS=-static will be activated. diff --git a/rules/gettext-dummy.make b/rules/gettext-dummy.make index c59b3ee85..feffcadae 100644 --- a/rules/gettext-dummy.make +++ b/rules/gettext-dummy.make @@ -28,26 +28,11 @@ GETTEXT_DUMMY_DIR := $(BUILDDIR)/$(GETTEXT_DUMMY) # Get # ---------------------------------------------------------------------------- -$(STATEDIR)/gettext-dummy.get: - @$(call targetinfo, $@) - @$(call touch, $@) - $(GETTEXT_DUMMY_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, GETTEXT_DUMMY) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/gettext-dummy.extract: - @$(call targetinfo, $@) - @$(call clean, $(GETTEXT_DUMMY_DIR)) - @$(call extract, GETTEXT_DUMMY) - @$(call patchin, GETTEXT_DUMMY) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -59,38 +44,12 @@ GETTEXT_DUMMY_ENV := $(CROSS_ENV) # GETTEXT_DUMMY_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/gettext-dummy.prepare: - @$(call targetinfo, $@) - @$(call clean, $(GETTEXT_DUMMY_DIR)/config.cache) - cd $(GETTEXT_DUMMY_DIR) && \ - $(GETTEXT_DUMMY_PATH) $(GETTEXT_DUMMY_ENV) \ - ./configure $(GETTEXT_DUMMY_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/gettext-dummy.compile: - @$(call targetinfo, $@) - cd $(GETTEXT_DUMMY_DIR) && $(GETTEXT_DUMMY_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/gettext-dummy.install: - @$(call targetinfo, $@) - @$(call install, GETTEXT_DUMMY) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- $(STATEDIR)/gettext-dummy.targetinstall: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install_init, gettext-dummy) @$(call install_fixup, gettext-dummy,PACKAGE,gettext-dummy) @@ -103,14 +62,14 @@ $(STATEDIR)/gettext-dummy.targetinstall: @$(call install_copy, gettext-dummy, 0, 0, 0644, \ $(GETTEXT_DUMMY_DIR)/.libs/libintl.so.0.0.0, \ - /usr/lib/libpv.so.0.0.0) + /usr/lib/libintl.so.0.0.0) @$(call install_link, gettext-dummy, libintl.so.0.0.0, /usr/lib/libintl.so.0) @$(call install_link, gettext-dummy, libintl.so.0.0.0, /usr/lib/libintl.so) @$(call install_finish, gettext-dummy) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean diff --git a/rules/glibc.in b/rules/glibc.in index b3696e5c0..6c8818dee 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -16,7 +16,7 @@ config GLIBC_VERSION comment "Install options" depends on GLIBC -config GLIBC_LIBC +config GLIBC_C bool depends on GLIBC default y @@ -50,7 +50,7 @@ config GLIBC_THREAD_DB library will be required. You can omit this library, if you never intend to debug multithread application on your target. -config GLIBC_LIBRT +config GLIBC_RT bool depends on GLIBC prompt "Install librt on the target" @@ -96,7 +96,7 @@ config GLIBC_UTIL Contains code for "standard" functions used in many different Unix utilities. -config GLIBC_LIBM +config GLIBC_M bool depends on GLIBC prompt "Install libm on the target" @@ -175,6 +175,7 @@ config GLIBC_NSL transport-level interface to networking services like i.E. nis(+) + config GLIBC_I18N_BIN_LOCALE bool prompt "Install locale" diff --git a/rules/gmake.in b/rules/gmake.in index ddcc5022a..bedfe7068 100644 --- a/rules/gmake.in +++ b/rules/gmake.in @@ -1,8 +1,8 @@ config GMAKE tristate prompt "gmake" - select GLIBC_LIBRT - select GLIBC_PTHREAD + select LIBC_RT + select LIBC_PTHREAD help gmake is GNU make. diff --git a/rules/initng.in b/rules/initng.in index 9cfcd3e82..86726d003 100644 --- a/rules/initng.in +++ b/rules/initng.in @@ -2,7 +2,7 @@ menuconfig INITNG bool select HOST_CMAKE select NCURSES - select GLIBC_DL + select LIBC_DL prompt "initng " help Initng is a full replacement of the old and in many ways diff --git a/rules/mc.in b/rules/mc.in index 0a45644d2..15a376fdd 100644 --- a/rules/mc.in +++ b/rules/mc.in @@ -3,7 +3,7 @@ menuconfig MC select GLIB select NCURSES if MC_USES_NCURSES select SLANG if MC_USES_SLANG - select GLIBC_NSL + select LIBC_NSL prompt "midnight commander " help midnight commander is a text oriented file manager diff --git a/rules/mplayer.in b/rules/mplayer.in index 8f930d20d..2727c3d62 100644 --- a/rules/mplayer.in +++ b/rules/mplayer.in @@ -30,7 +30,7 @@ config MPLAYER_VI_V4L1 config MPLAYER_VI_V4L2 bool - select GLIBC_PTHREAD + select LIBC_PTHREAD prompt "v4l2 support" depends on MPLAYER_VI diff --git a/rules/portmap.in b/rules/portmap.in index 0a84538a9..9cad286e7 100644 --- a/rules/portmap.in +++ b/rules/portmap.in @@ -1,7 +1,7 @@ menuconfig PORTMAP bool prompt "portmapper " - select GLIBC_NSL + select LIBC_NSL help Portmap is a server that converts RPC program numbers into DARPA protocol port numbers. It must be running in order to make RPC calls. diff --git a/rules/python.in b/rules/python.in index e87935903..b252412a3 100644 --- a/rules/python.in +++ b/rules/python.in @@ -2,8 +2,8 @@ config PYTHON23 bool depends on BROKEN prompt "python 2.3 [BROKEN]" - depends on GLIBC_DL || UCLIBC_DL - select GLIBC_UTIL if GLIBC + select LIBC_DL + select LIBC_UTIL select GCCLIBS_CXX help Python is a dynamic object-oriented programming diff --git a/rules/python24.in b/rules/python24.in index bacae21d8..e56d44f06 100644 --- a/rules/python24.in +++ b/rules/python24.in @@ -1,12 +1,10 @@ config PYTHON24 bool prompt "Python 2.4" - # FIXME: make this uClibc/glibc aware - select GLIBC_DL + select LIBC_DL + select LIBC_UTIL + select LIBC_PTHREAD select HOST_PYTHON24 - select GLIBC_UTIL - select GLIBC_PTHREAD - select GLIBC select GCCLIBS_CXX help Python is a dynamic object-oriented programming diff --git a/rules/samba.in b/rules/samba.in index ea22e299c..61409c276 100644 --- a/rules/samba.in +++ b/rules/samba.in @@ -3,9 +3,8 @@ menuconfig SAMBA bool prompt "samba " - select GLIBC - select GLIBC_NSL - select GLIBC_RESOLV + select LIBC_NSL + select LIBC_RESOLV help Samba is an Open Source/Free Software suite that has, since 1992, provided file and print services to all manner of diff --git a/rules/syslogng.in b/rules/syslogng.in index cad6e5390..b20af1a69 100644 --- a/rules/syslogng.in +++ b/rules/syslogng.in @@ -5,6 +5,7 @@ menuconfig SYSLOGNG prompt "syslog-ng " select EVENTLOG select GLIB + select LIBC_RT help The next generation syslog daemon. diff --git a/rules/xorg-server.in b/rules/xorg-server.in index 1df393b5a..a871035c7 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -34,7 +34,7 @@ menuconfig XORG_SERVER select XORG_LIB_XFONT select XORG_LIB_XKBFILE - select GLIBC_DL + select LIBC_DL select PIXMAN # # Required on demand |