Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[8013] branches/1.0
|
From: <abe...@us...> - 2016-12-05 04:26:21
|
Revision: 8013
http://sourceforge.net/p/astlinux/code/8013
Author: abelbeck
Date: 2016-12-05 04:26:18 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
libedit, new package replacing the somewhat bloated readline, only used by sqlite CLI tool and chronyc, could be used by Asterisk but does not work with the latest UTF-8 enabled libedit. BR2_PACKAGE_READLINE no longer needs to be enabled with BR2_PACKAGE_LIBEDIT=y
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/chrony/chrony.mk
branches/1.0/package/sqlite/Config.in
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/libedit/
branches/1.0/package/libedit/Config.in
branches/1.0/package/libedit/libedit.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast11.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -536,7 +536,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -639,6 +638,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast13.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -536,7 +536,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -639,6 +638,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/initrd.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -524,6 +524,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
# BR2_PACKAGE_NCURSES is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -405,6 +405,7 @@
menu "Text and terminal handling"
source "package/enchant/Config.in"
source "package/icu/Config.in"
+source "package/libedit/Config.in"
source "package/libiconv/Config.in"
source "package/ncurses/Config.in"
source "package/newt/Config.in"
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -52,6 +52,10 @@
ASTERISK_CONFIGURE_ARGS+= \
--without-cap
+# Asterisk does not work using system libedit with wide-char/UTF-8 support
+ASTERISK_CONFIGURE_ARGS+= \
+ --without-libedit
+
ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
ASTERISK_EXTRAS+=libxml2
ASTERISK_CONFIGURE_ARGS+= \
Modified: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/chrony/chrony.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -28,8 +28,12 @@
ifeq ($(BR2_PACKAGE_READLINE),y)
CHRONY_DEPENDENCIES += readline
+CHRONY_CONF_OPT += --without-editline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+CHRONY_DEPENDENCIES += libedit
+CHRONY_CONF_OPT += --without-readline
else
-CHRONY_CONF_OPT += --disable-readline
+CHRONY_CONF_OPT += --without-editline --without-readline
endif
# If pps-tools is available, build it before so the package can use it
Added: branches/1.0/package/libedit/Config.in
===================================================================
--- branches/1.0/package/libedit/Config.in (rev 0)
+++ branches/1.0/package/libedit/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBEDIT
+ bool "libedit"
+ select BR2_PACKAGE_NCURSES
+ help
+ The editline library (from BSD) provides generic line editing
+ and history functions. It slightly resembles GNU readline.
+
+ Jess Thrysoee maintains an autotoolified package, which we use
+ in Buildroot as it makes it much simpler than using the upstream
+ sources which require pmake.
+
+ http://www.thrysoee.dk/editline
+
Added: branches/1.0/package/libedit/libedit.mk
===================================================================
--- branches/1.0/package/libedit/libedit.mk (rev 0)
+++ branches/1.0/package/libedit/libedit.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libedit
+#
+################################################################################
+
+LIBEDIT_VERSION = 20160903-3.1
+LIBEDIT_SITE = http://thrysoee.dk/editline
+LIBEDIT_INSTALL_STAGING = YES
+
+LIBEDIT_DEPENDENCIES = ncurses
+
+define LIBEDIT_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libedit.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define LIBEDIT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libedit.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,libedit))
Modified: branches/1.0/package/sqlite/Config.in
===================================================================
--- branches/1.0/package/sqlite/Config.in 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -6,11 +6,3 @@
http://www.sqlite.org/
-config BR2_PACKAGE_SQLITE_READLINE
- bool "Command-line editing"
- depends on BR2_PACKAGE_SQLITE
- select BR2_PACKAGE_NCURSES
- select BR2_PACKAGE_READLINE
- help
- Enable command-line editing. This requires ncurses and readline.
-
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/sqlite.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -18,11 +18,14 @@
--enable-threadsafe \
--localstatedir=/var
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
-SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPT += --enable-readline
+ifeq ($(BR2_PACKAGE_READLINE),y)
+SQLITE_DEPENDENCIES += readline
+SQLITE_CONF_OPT += --disable-editline --enable-readline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+SQLITE_DEPENDENCIES += libedit
+SQLITE_CONF_OPT += --enable-editline --disable-readline
else
-SQLITE_CONF_OPT += --disable-readline
+SQLITE_CONF_OPT += --disable-editline --disable-readline
endif
define SQLITE_UNINSTALL_TARGET_CMDS
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix-iso.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -549,6 +549,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -550,6 +550,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -620,6 +619,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -620,6 +619,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/initrd.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -505,6 +505,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
# BR2_PACKAGE_NCURSES is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
