r2002 - in trunk
dslinux_gpf at dslinux.in-berlin.de
dslinux_gpf at dslinux.in-berlin.de
Thu Oct 18 10:53:09 CEST 2007
Author: gpf
Date: 2007-10-18 10:53:03 +0200 (Thu, 18 Oct 2007)
New Revision: 2002
Log:
irssi for dslinux and its dependancies libiconv, gettext(libintl), and glib
Modified: trunk/config/Configure.help
===================================================================
--- trunk/config/Configure.help 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/config/Configure.help 2007-10-18 08:53:03 UTC (rev 2002)
@@ -422,6 +422,9 @@
CONFIG_USER_BITCHX_BITCHX
Text mode IRC client.
+CONFIG_USER_IRSSI_IRSSI
+ Text mode IRC client.
+
CONFIG_USER_BPALOGIN_BPALOGIN
Telstra Bigpond broadband internet authentication program.
Approx. binary size: 39k
@@ -827,6 +830,21 @@
Only enable this if you want to force the library to be built. The
Config will make sure this library is built if it is needed.
+CONFIG_LIB_LIBICONV_FORCE
+ Enable libiconv library.
+ Only enable this if you want to force the library to be built. The
+ Config will make sure this library is built if it is needed.
+
+CONFIG_LIB_LIBGETTEXT_FORCE
+ Enable gettext library.
+ Only enable this if you want to force the library to be built. The
+ Config will make sure this library is built if it is needed.
+
+CONFIG_LIB_LIBGLIB_FORCE
+ Enable glib library.
+ Only enable this if you want to force the library to be built. The
+ Config will make sure this library is built if it is needed.
+
CONFIG_USER_BOA_EMERG
If enabled, boa will syslog all messages at the emergency level
Modified: trunk/config/config.in
===================================================================
--- trunk/config/config.in 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/config/config.in 2007-10-18 08:53:03 UTC (rev 2002)
@@ -118,6 +118,9 @@
bool 'Build libmad' CONFIG_LIB_MAD_FORCE
bool 'Build uClibc++' CONFIG_LIB_UCLIBCPP_FORCE
bool 'Build libwww' CONFIG_LIB_LIBWWW_FORCE
+bool 'Build libiconv' CONFIG_LIB_LIBICONV_FORCE
+bool 'Build libgettext' CONFIG_LIB_LIBGETTEXT_FORCE
+bool 'Build libglib' CONFIG_LIB_LIBGLIB_FORCE
comment 'Library Configuration'
bool 'Support time zones' CONFIG_LIB_UC_LIBC_TIMEZONE
@@ -431,6 +434,12 @@
bool ' arping' CONFIG_USER_IPUTILS_ARPING
bool ' rarpd' CONFIG_USER_IPUTILS_RARPD
fi
+bool 'irssi' CONFIG_USER_IRSSI_IRSSI
+ if [ "$CONFIG_USER_IRSSI_IRSSI" = "y" ]; then
+ define_bool CONFIG_LIB_LIBICONV y
+ define_bool CONFIG_LIB_LIBGETTEXT y
+ define_bool CONFIG_LIB_LIBGLIB y
+ fi
bool 'kendin-config' CONFIG_USER_KENDIN_CONFIG
bool 'klaxon' CONFIG_USER_KLAXON_KLAXON
if [ "$CONFIG_USER_KLAXON_KLAXON" = "y" ]; then
Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/include/Makefile 2007-10-18 08:53:03 UTC (rev 2002)
@@ -65,7 +65,10 @@
$(ROOTDIR)/lib/libwww/src/wwwconf.h,. \
$(ROOTDIR)/lib/libwww/src/modules/expat/xmlparse/xmlparse.h,. \
$(ROOTDIR)/lib/libwww/src/modules/expat/xmltok/xmltok.h,. \
- $(ROOTDIR)/lib/libwww/src/modules/md5/md5.h,.
+ $(ROOTDIR)/lib/libwww/src/modules/md5/md5.h,. \
+ $(ROOTDIR)/lib/libiconv/src/include/iconv.h,. \
+ $(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/libintl.h,. \
+ $(ROOTDIR)/lib/glib/src/glib/glib.h,.
#
# Both freeswan and openswan can provide des and crypto headers
Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/lib/Makefile 2007-10-18 08:53:03 UTC (rev 2002)
@@ -96,6 +96,12 @@
dir_$(CONFIG_LIB_UCLIBCPP_FORCE)+= uClibc++
dir_$(CONFIG_LIB_LIBWWW) += libwww
dir_$(CONFIG_LIB_LIBWWW_FORCE) += libwww
+dir_$(CONFIG_LIB_LIBICONV) += libiconv
+dir_$(CONFIG_LIB_LIBICONV_FORCE) += libiconv
+dir_$(CONFIG_LIB_LIBGETTEXT) += gettext
+dir_$(CONFIG_LIB_LIBGETTEXT_FORCE) += gettext
+dir_$(CONFIG_LIB_LIBGLIB) += glib
+dir_$(CONFIG_LIB_LIBGLIB_FORCE) += glib
# And build libraries in the prop directory last
dir_y += $(ROOTDIR)/prop
@@ -184,9 +190,12 @@
$(ROOTDIR)/lib/libwww/src/Library/src/.libs/*.a \
$(ROOTDIR)/lib/libwww/src/modules/expat/xmlparse/.libs/*.a \
$(ROOTDIR)/lib/libwww/src/modules/expat/xmltok/.libs/*.a \
- $(ROOTDIR)/lib/libwww/src/modules/md5/.libs/*.a
+ $(ROOTDIR)/lib/libwww/src/modules/md5/.libs/*.a \
+ $(ROOTDIR)/lib/libiconv/src/lib/.libs/*.a \
+ $(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/.libs/*.a \
+ $(ROOTDIR)/lib/glib/src/glib/.libs/*.a \
+ $(ROOTDIR)/lib/glib/src/gmodule/.libs/*.a
-
##############################################################################
make_links: clean_links
Added: trunk/lib/gettext/Makefile
Copied: trunk/lib/gettext/src (from rev 2001, tags/gettext/gettext-0.16)
Added: trunk/lib/glib/Makefile
Copied: trunk/lib/glib/src (from rev 2001, tags/glib/glib-2.12.13)
Added: trunk/lib/glib/src/config.cache.tmpl
Added: trunk/lib/libiconv/Makefile
Copied: trunk/lib/libiconv/src (from rev 2001, tags/libiconv/libiconv-1.11)
Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/user/Makefile 2007-10-18 08:53:03 UTC (rev 2002)
@@ -173,6 +173,7 @@
dir_$(CONFIG_USER_IPTABLES_IPTABLES) += iptables
dir_$(CONFIG_USER_IPTABLES_IP6TABLES) += iptables
dir_$(CONFIG_USER_IPUTILS_IPUTILS) += iputils
+dir_$(CONFIG_USER_IRSSI_IRSSI) += irssi
dir_$(CONFIG_USER_KENDIN_CONFIG) += kendin-config
dir_$(CONFIG_USER_KLAXON_KLAXON) += klaxon
dir_$(CONFIG_USER_L2TPD_L2TPD) += l2tpd
Added: trunk/user/irssi/Makefile
Copied: trunk/user/irssi/src (from rev 2001, tags/irssi/irssi-0.8.12)
Modified: trunk/user/irssi/src/src/core/net-nonblock.c
===================================================================
--- tags/irssi/irssi-0.8.12/src/core/net-nonblock.c 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/user/irssi/src/src/core/net-nonblock.c 2007-10-18 08:53:03 UTC (rev 2002)
@@ -86,7 +86,7 @@
g_return_val_if_fail(addr != NULL, FALSE);
#ifndef WIN32
- pid = fork();
+ pid = vfork();
if (pid > 0) {
/* parent */
pidwait_add(pid);
Modified: trunk/user/irssi/src/src/fe-common/core/fe-exec.c
===================================================================
--- tags/irssi/irssi-0.8.12/src/fe-common/core/fe-exec.c 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/user/irssi/src/src/fe-common/core/fe-exec.c 2007-10-18 08:53:03 UTC (rev 2002)
@@ -293,7 +293,7 @@
return;
shell_args[2] = cmd;
- rec->pid = fork();
+ rec->pid = vfork();
if (rec->pid == -1) {
/* error */
close(in[0]); close(in[1]);
Modified: trunk/vendors/Nintendo/DLDI/config.vendor
===================================================================
--- trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-17 22:30:24 UTC (rev 2001)
+++ trunk/vendors/Nintendo/DLDI/config.vendor 2007-10-18 08:53:03 UTC (rev 2002)
@@ -197,6 +197,7 @@
# CONFIG_USER_FNORD_HTTPD is not set
# CONFIG_USER_BOA_SRC_BOA is not set
CONFIG_USER_BITCHX_BITCHX=y
+CONFIG_USER_IRSSI_IRSSI=y
# CONFIG_USER_BPALOGIN_BPALOGIN is not set
# CONFIG_USER_BR2684CTL_BR2684CTL is not set
# CONFIG_USER_BRCFG_BRCFG is not set
More information about the dslinux-commit
mailing list