[v2] dash: enable line editting if libedit is selected.

Message ID 1506622076-21776-1-git-send-email-casantos@datacom.ind.br
State Accepted
Commit 651af57cf011e6d8764d11932ce87fc064cd9a9b
Headers show
Series
  • [v2] dash: enable line editting if libedit is selected.
Related show

Commit Message

Carlos Santos Sept. 28, 2017, 6:07 p.m.
Otherwise, explicitly disable it, so that the configure script does not
misdetect a system-installed libedit for example.

Also, add a profile snippet enabling line editing, Emacs style.

Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
 package/dash/dash.mk | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

Peter Korsgaard Feb. 4, 2018, 11:07 a.m. | #1
>>>>> "Carlos" == Carlos Santos <casantos@datacom.ind.br> writes:

 > Otherwise, explicitly disable it, so that the configure script does not
 > misdetect a system-installed libedit for example.

 > Also, add a profile snippet enabling line editing, Emacs style.

 > Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
 > Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
 > ---
 >  package/dash/dash.mk | 13 +++++++++++++
 >  1 file changed, 13 insertions(+)

 > diff --git a/package/dash/dash.mk b/package/dash/dash.mk
 > index 72ef722..0098fad 100644
 > --- a/package/dash/dash.mk
 > +++ b/package/dash/dash.mk
 > @@ -10,6 +10,19 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
 >  DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
 >  DASH_LICENSE_FILES = COPYING
 
 > +# Enable line editing, Emacs style
 > +define DASH_INSTALL_PROFILE
 > +	echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
 > +endef
 > +
 > +ifeq ($(BR2_PACKAGE_LIBEDIT),y)
 > +DASH_DEPENDENCIES += libedit
 > +DASH_CONF_OPTS += --with-libedit
 > +DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE

Committed after moving DASH_INSTALL_PROFILE inside the conditional,
thanks.
Peter Korsgaard Feb. 4, 2018, 11:10 a.m. | #2
>>>>> "Carlos" == Carlos Santos <casantos@datacom.ind.br> writes:

 > Otherwise, explicitly disable it, so that the configure script does not
 > misdetect a system-installed libedit for example.

 > Also, add a profile snippet enabling line editing, Emacs style.

 > Change-Id: I68c6dbbafa95e266860329cb9c7ff5519fda5bf8
 > Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
 > ---
 >  package/dash/dash.mk | 13 +++++++++++++
 >  1 file changed, 13 insertions(+)

 > diff --git a/package/dash/dash.mk b/package/dash/dash.mk
 > index 72ef722..0098fad 100644
 > --- a/package/dash/dash.mk
 > +++ b/package/dash/dash.mk
 > @@ -10,6 +10,19 @@ DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
 >  DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
 >  DASH_LICENSE_FILES = COPYING
 
 > +# Enable line editing, Emacs style
 > +define DASH_INSTALL_PROFILE
 > +	echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh

/etc/profile.d is part of our standard skeleton, but may not be present
in custom skeletons, so I've also added a mkdir -p
${TARGET_DIR}/etc/profile.d

Patch

diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 72ef722..0098fad 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -10,6 +10,19 @@  DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
 DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
 DASH_LICENSE_FILES = COPYING
 
+# Enable line editing, Emacs style
+define DASH_INSTALL_PROFILE
+	echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
+endef
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+DASH_DEPENDENCIES += libedit
+DASH_CONF_OPTS += --with-libedit
+DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
+else
+DASH_CONF_OPTS += --without-libedit
+endif
+
 define DASH_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
 endef