[Buildroot] [PATCH V2 2/2] tcl: rename BR2_PACKAGE_TCL_SHLIB_ONLY to be more consistent

Vicente Olivert Riera Vincent.Riera at imgtec.com
Sat Mar 7 13:22:42 UTC 2015


The BR2_PACKAGE_TCL_SHLIB_ONLY is confusing because someone could think
that only shared libraries would be installed. But, what actually does
is removing the 'tclsh' binary, so better to reword it in order to be
consistent with what actually does.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
---
Changes V1 -> V2: add an entry to Config.in.legacy

 Config.in.legacy      |   12 ++++++++++++
 package/tcl/Config.in |    7 +++----
 package/tcl/tcl.mk    |    2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index 0b87ddb..9a48045 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -100,6 +100,18 @@ endif
 
 ###############################################################################
 
+config BR2_PACKAGE_TCL_SHLIB_ONLY
+	string "tcl: the 'install only shared library' option has been renamed"
+	help
+	  The option BR2_PACKAGE_TCL_SHLIB_ONLY has been renamed to
+	  BR2_PACKAGE_TCL_REMOVE_TCLSH to be consistent with what it
+	  does.
+
+config BR2_PACKAGE_TCL_SHLIB_ONLY_WRAP
+	bool
+	default y if BR2_PACKAGE_TCL_SHLIB_ONLY != ""
+	select BR2_LEGACY
+
 comment "Legacy options removed in 2015.02"
 
 config BR2_PACKAGE_LIBGC
diff --git a/package/tcl/Config.in b/package/tcl/Config.in
index c3d0d87..996dc96 100644
--- a/package/tcl/Config.in
+++ b/package/tcl/Config.in
@@ -25,12 +25,11 @@ config BR2_PACKAGE_TCL_DEL_ENCODINGS
 
 	  It saves approx. 1.6 Mb of space.
 
-config BR2_PACKAGE_TCL_SHLIB_ONLY
-	bool "install only shared library"
+config BR2_PACKAGE_TCL_REMOVE_TCLSH
+	bool "do not install tclsh"
 	default y
 	help
-	  Install only TCL shared library and not binary tcl
-	  interpreter (tclsh).
+	  Do not install the tcl interpreter (tclsh).
 
 	  Saves ~14kb.
 
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 0c328ee..5d851f3 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -69,7 +69,7 @@ endef
 TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_ENCODINGS
 endif
 
-ifeq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
+ifeq ($(BR2_PACKAGE_TCL_REMOVE_TCLSH),y)
 define TCL_REMOVE_TCLSH
 	rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
 endef
-- 
1.7.1




More information about the buildroot mailing list