All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2
@ 2012-12-03 16:12 Francois Perrad
  2012-12-03 16:12 ` [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 Francois Perrad
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Francois Perrad @ 2012-12-03 16:12 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/perl/perl.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index 391047d..a86ee2a 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -5,7 +5,7 @@
 #############################################################
 
 PERL_VERSION_MAJOR = 16
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
 PERL_LICENSE = Artistic
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0
  2012-12-03 16:12 [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Francois Perrad
@ 2012-12-03 16:12 ` Francois Perrad
  2012-12-05 16:39   ` Peter Korsgaard
  2012-12-03 16:12 ` [Buildroot] [PATCH 3/4] linenoise: new package Francois Perrad
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2012-12-03 16:12 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/luajit/luajit-01-root-path.patch      |    2 +-
 package/luajit/luajit-04-no-bin-symlink.patch |   18 ++----------------
 package/luajit/luajit.mk                      |    2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch
index 80ad1e9..cc2f04f 100644
--- a/package/luajit/luajit-01-root-path.patch
+++ b/package/luajit/luajit-01-root-path.patch
@@ -18,5 +18,5 @@ Index: b/src/luaconf.h
 +#define LUA_LDIR	LUA_ROOT "share/lua/"
 +#define LUA_CDIR	LUA_ROOT "lib/lua/"
  #ifdef LUA_XROOT
- #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0-beta11/"
+ #define LUA_JDIR	LUA_XROOT "share/luajit-2.0.0/"
  #define LUA_XPATH \
diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch
index 91a470a..0de3162 100644
--- a/package/luajit/luajit-04-no-bin-symlink.patch
+++ b/package/luajit/luajit-04-no-bin-symlink.patch
@@ -6,7 +6,7 @@ Index: b/Makefile
 ===================================================================
 --- a/Makefile
 +++ b/Makefile
-@@ -43,8 +43,7 @@
+@@ -42,8 +42,7 @@
  INSTALL_MAN= $(INSTALL_SHARE)/man/man1
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
@@ -16,7 +16,7 @@ Index: b/Makefile
  INSTALL_ANAME= libluajit-$(ABIVER).a
  INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
  INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -58,7 +57,6 @@
+@@ -57,7 +56,6 @@
  INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
  INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
@@ -24,17 +24,3 @@ Index: b/Makefile
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
  INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-@@ -120,13 +118,6 @@
- 	  $(RM) $(FILE_PC).tmp
- 	cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
- 	cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
--	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
--	@echo ""
--	@echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
--	@echo "You can do this now by running this command (with sudo):"
--	@echo ""
--	@echo "  $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
--	@echo ""
- 
- uninstall:
- 	@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 2583f92..844122e 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LUAJIT_VERSION = 2.0.0-beta11
+LUAJIT_VERSION = 2.0.0
 LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE    = http://luajit.org/download
 LUAJIT_LICENSE = MIT
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] linenoise: new package
  2012-12-03 16:12 [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Francois Perrad
  2012-12-03 16:12 ` [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 Francois Perrad
@ 2012-12-03 16:12 ` Francois Perrad
  2012-12-05 16:42   ` Peter Korsgaard
  2012-12-03 16:12 ` [Buildroot] [PATCH 4/4] lua: support linenoise Francois Perrad
  2012-12-05 16:39 ` [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Peter Korsgaard
  3 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2012-12-03 16:12 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/Config.in                             |    1 +
 package/linenoise/Config.in                   |    6 ++++
 package/linenoise/linenoise-get-columns.patch |   17 ++++++++++
 package/linenoise/linenoise.mk                |   45 +++++++++++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 package/linenoise/Config.in
 create mode 100644 package/linenoise/linenoise-get-columns.patch
 create mode 100644 package/linenoise/linenoise.mk

diff --git a/package/Config.in b/package/Config.in
index 5ba1f05..6117716 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -523,6 +523,7 @@ menu "Text and terminal handling"
 source "package/enchant/Config.in"
 source "package/icu/Config.in"
 source "package/libiconv/Config.in"
+source "package/linenoise/Config.in"
 source "package/ncurses/Config.in"
 source "package/newt/Config.in"
 source "package/pcre/Config.in"
diff --git a/package/linenoise/Config.in b/package/linenoise/Config.in
new file mode 100644
index 0000000..8e4ab91
--- /dev/null
+++ b/package/linenoise/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LINENOISE
+	bool "linenoise"
+	help
+	  A small self-contained alternative to readline and libedit
+
+	  https://github.com/antirez/linenoise
diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
new file mode 100644
index 0000000..180d1c3
--- /dev/null
+++ b/package/linenoise/linenoise-get-columns.patch
@@ -0,0 +1,17 @@
+see http://github.com/antirez/linenoise/pull/31
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/linenoise.c
+===================================================================
+--- a/linenoise.c
++++ b/linenoise.c
+@@ -182,7 +182,7 @@
+ static int getColumns(void) {
+     struct winsize ws;
+ 
+-    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
++    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
+     return ws.ws_col;
+ }
+ 
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
new file mode 100644
index 0000000..e7b6124
--- /dev/null
+++ b/package/linenoise/linenoise.mk
@@ -0,0 +1,45 @@
+#############################################################
+#
+# linenoise
+#
+#############################################################
+LINENOISE_VERSION = g8c9b481
+LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
+LINENOISE_LICENSE = BSD-2c
+LINENOISE_INSTALL_STAGING = YES
+
+define LINENOISE_BUILD_CMDS
+	cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -c linenoise.c
+	cd $(@D); $(TARGET_AR) rcu liblinenoise.a linenoise.o
+	cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -o linenoise_example example.c -L. -llinenoise
+endef
+
+define LINENOISE_INSTALL_STAGING_CMDS
+	$(INSTALL) -m 644 -D $(@D)/linenoise.h          $(STAGING_DIR)/usr/include/linenoise.h
+	$(INSTALL) -m 644 -D $(@D)/liblinenoise.a       $(STAGING_DIR)/usr/lib/liblinenoise.a
+	$(INSTALL) -m 755 -D $(@D)/linenoise_example    $(STAGING_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_UNINSTALL_STAGING_CMDS
+	rm -f   $(STAGING_DIR)/usr/include/linenoise.h
+	rm -f   $(STAGING_DIR)/usr/lib/liblinenoise.a
+	rm -f   $(STAGING_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 644 -D $(@D)/linenoise.h          $(TARGET_DIR)/usr/include/linenoise.h
+	$(INSTALL) -m 644 -D $(@D)/liblinenoise.a       $(TARGET_DIR)/usr/lib/liblinenoise.a
+	$(INSTALL) -m 755 -D $(@D)/linenoise_example    $(TARGET_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_UNINSTALL_TARGET_CMDS
+	rm -f   $(TARGET_DIR)/usr/include/linenoise.h
+	rm -f   $(TARGET_DIR)/usr/lib/liblinenoise.a
+	rm -f   $(TARGET_DIR)/usr/bin/linenoise_example
+endef
+
+define LINENOISE_CLEAN_CMDS
+	rm -f $(@D)/*.o $(@D)/*.a $(@D)/linenoise_example
+endef
+
+$(eval $(generic-package))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] lua: support linenoise
  2012-12-03 16:12 [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Francois Perrad
  2012-12-03 16:12 ` [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 Francois Perrad
  2012-12-03 16:12 ` [Buildroot] [PATCH 3/4] linenoise: new package Francois Perrad
@ 2012-12-03 16:12 ` Francois Perrad
  2012-12-05 19:00   ` Peter Korsgaard
  2012-12-05 16:39 ` [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Peter Korsgaard
  3 siblings, 1 reply; 9+ messages in thread
From: Francois Perrad @ 2012-12-03 16:12 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/lua/Config.in              |   17 +++++++++++++++++
 package/lua/lua-11-linenoise.patch |   24 ++++++++++++++++++++++++
 package/lua/lua.mk                 |    8 +++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 package/lua/lua-11-linenoise.patch

diff --git a/package/lua/Config.in b/package/lua/Config.in
index 8233e2a..4166730 100644
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -7,6 +7,15 @@ config BR2_PACKAGE_LUA
 
 if BR2_PACKAGE_LUA
 
+choice
+	prompt "Lua Interpreter command-line editing"
+	default BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+
+config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE
+	bool "none"
+	help
+	  None.
+
 config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	bool "readline support"
 	select BR2_PACKAGE_READLINE
@@ -14,4 +23,12 @@ config BR2_PACKAGE_LUA_INTERPRETER_READLINE
 	help
 	  Enables command-line editing in the lua interpreter.
 
+config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE
+	bool "linenoise support"
+	select BR2_PACKAGE_LINENOISE
+	help
+	  Enables command-line editing in the lua interpreter.
+
+endchoice
+
 endif
diff --git a/package/lua/lua-11-linenoise.patch b/package/lua/lua-11-linenoise.patch
new file mode 100644
index 0000000..488c080
--- /dev/null
+++ b/package/lua/lua-11-linenoise.patch
@@ -0,0 +1,24 @@
+Add support of linenoise (replace readline)
+
+see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/src/luaconf.h
+===================================================================
+--- a/src/luaconf.h
++++ b/src/luaconf.h
+@@ -279,6 +279,13 @@
+ 	if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
+ 	  add_history(lua_tostring(L, idx));  /* add it to history */
+ #define lua_freeline(L,b)	((void)L, free(b))
++#elif defined(LUA_USE_LINENOISE)
++#include <linenoise.h>
++#define lua_readline(L,b,p)	((void)L, ((b)=linenoise(p)) != NULL)
++#define lua_saveline(L,idx) \
++	if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
++	  linenoiseHistoryAdd(lua_tostring(L, idx));  /* add it to history */
++#define lua_freeline(L,b)	((void)L, free(b))
+ #else
+ #define lua_readline(L,b,p)	\
+ 	((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 9e0d387..32acc99 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -16,10 +16,16 @@ LUA_MYLIBS += -ldl
 ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 	LUA_DEPENDENCIES = readline ncurses
 	LUA_MYLIBS += -lreadline -lhistory -lncurses
-	LUA_CFLAGS += -DLUA_USE_LINUX
+	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE
+else
+ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y)
+	LUA_DEPENDENCIES = linenoise
+	LUA_MYLIBS += -llinenoise
+	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_LINENOISE
 else
 	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 endif
+endif
 
 # We never want to have host-readline and host-ncurses as dependencies
 # of host-lua.
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2
  2012-12-03 16:12 [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Francois Perrad
                   ` (2 preceding siblings ...)
  2012-12-03 16:12 ` [Buildroot] [PATCH 4/4] lua: support linenoise Francois Perrad
@ 2012-12-05 16:39 ` Peter Korsgaard
  3 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2012-12-05 16:39 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0
  2012-12-03 16:12 ` [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 Francois Perrad
@ 2012-12-05 16:39   ` Peter Korsgaard
  0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2012-12-05 16:39 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] linenoise: new package
  2012-12-03 16:12 ` [Buildroot] [PATCH 3/4] linenoise: new package Francois Perrad
@ 2012-12-05 16:42   ` Peter Korsgaard
  2012-12-05 18:06     ` François Perrad
  0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2012-12-05 16:42 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
 Francois> ---
 Francois>  package/Config.in                             |    1 +
 Francois>  package/linenoise/Config.in                   |    6 ++++
 Francois>  package/linenoise/linenoise-get-columns.patch |   17 ++++++++++
 Francois>  package/linenoise/linenoise.mk                |   45 +++++++++++++++++++++++++
 Francois>  4 files changed, 69 insertions(+)
 Francois>  create mode 100644 package/linenoise/Config.in
 Francois>  create mode 100644 package/linenoise/linenoise-get-columns.patch
 Francois>  create mode 100644 package/linenoise/linenoise.mk

 Francois> diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
 Francois> new file mode 100644
 Francois> index 0000000..180d1c3
 Francois> --- /dev/null
 Francois> +++ b/package/linenoise/linenoise-get-columns.patch
 Francois> @@ -0,0 +1,17 @@
 Francois> +see http://github.com/antirez/linenoise/pull/31

It would still be good to describe what it does and why.


 Francois> +
 Francois> +Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
 Francois> +
 Francois> +Index: b/linenoise.c
 Francois> +===================================================================
 Francois> +--- a/linenoise.c
 Francois> ++++ b/linenoise.c
 Francois> +@@ -182,7 +182,7 @@
 Francois> + static int getColumns(void) {
 Francois> +     struct winsize ws;
 Francois> + 
 Francois> +-    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
 Francois> ++    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
 Francois> +     return ws.ws_col;
 Francois> + }
 Francois> + 
 Francois> diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
 Francois> new file mode 100644
 Francois> index 0000000..e7b6124
 Francois> --- /dev/null
 Francois> +++ b/package/linenoise/linenoise.mk
 Francois> @@ -0,0 +1,45 @@
 Francois> +#############################################################
 Francois> +#
 Francois> +# linenoise
 Francois> +#
 Francois> +#############################################################
 Francois> +LINENOISE_VERSION = g8c9b481
 Francois> +LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
 Francois> +LINENOISE_LICENSE = BSD-2c
 Francois> +LINENOISE_INSTALL_STAGING = YES
 Francois> +
 Francois> +define LINENOISE_BUILD_CMDS
 Francois> +	cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -c linenoise.c
 Francois> +	cd $(@D); $(TARGET_AR) rcu liblinenoise.a linenoise.o
 Francois> +	cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -o linenoise_example example.c -L. -llinenoise

Does it make sense to build and install the example? If it does, it
should also use $(TARGET_LDFLAGS).


-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] linenoise: new package
  2012-12-05 16:42   ` Peter Korsgaard
@ 2012-12-05 18:06     ` François Perrad
  0 siblings, 0 replies; 9+ messages in thread
From: François Perrad @ 2012-12-05 18:06 UTC (permalink / raw)
  To: buildroot

2012/12/5 Peter Korsgaard <jacmet@uclibc.org>:
>>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
>
>  Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>  Francois> ---
>  Francois>  package/Config.in                             |    1 +
>  Francois>  package/linenoise/Config.in                   |    6 ++++
>  Francois>  package/linenoise/linenoise-get-columns.patch |   17 ++++++++++
>  Francois>  package/linenoise/linenoise.mk                |   45 +++++++++++++++++++++++++
>  Francois>  4 files changed, 69 insertions(+)
>  Francois>  create mode 100644 package/linenoise/Config.in
>  Francois>  create mode 100644 package/linenoise/linenoise-get-columns.patch
>  Francois>  create mode 100644 package/linenoise/linenoise.mk
>
>  Francois> diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch
>  Francois> new file mode 100644
>  Francois> index 0000000..180d1c3
>  Francois> --- /dev/null
>  Francois> +++ b/package/linenoise/linenoise-get-columns.patch
>  Francois> @@ -0,0 +1,17 @@
>  Francois> +see http://github.com/antirez/linenoise/pull/31
>
> It would still be good to describe what it does and why.
>

Ok.

>
>  Francois> +
>  Francois> +Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>  Francois> +
>  Francois> +Index: b/linenoise.c
>  Francois> +===================================================================
>  Francois> +--- a/linenoise.c
>  Francois> ++++ b/linenoise.c
>  Francois> +@@ -182,7 +182,7 @@
>  Francois> + static int getColumns(void) {
>  Francois> +     struct winsize ws;
>  Francois> +
>  Francois> +-    if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80;
>  Francois> ++    if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80;
>  Francois> +     return ws.ws_col;
>  Francois> + }
>  Francois> +
>  Francois> diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
>  Francois> new file mode 100644
>  Francois> index 0000000..e7b6124
>  Francois> --- /dev/null
>  Francois> +++ b/package/linenoise/linenoise.mk
>  Francois> @@ -0,0 +1,45 @@
>  Francois> +#############################################################
>  Francois> +#
>  Francois> +# linenoise
>  Francois> +#
>  Francois> +#############################################################
>  Francois> +LINENOISE_VERSION = g8c9b481
>  Francois> +LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master
>  Francois> +LINENOISE_LICENSE = BSD-2c
>  Francois> +LINENOISE_INSTALL_STAGING = YES
>  Francois> +
>  Francois> +define LINENOISE_BUILD_CMDS
>  Francois> +    cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -c linenoise.c
>  Francois> +    cd $(@D); $(TARGET_AR) rcu liblinenoise.a linenoise.o
>  Francois> +    cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -o linenoise_example example.c -L. -llinenoise
>
> Does it make sense to build and install the example? If it does, it
> should also use $(TARGET_LDFLAGS).

Fixed in v2.

Fran?ois

>
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] lua: support linenoise
  2012-12-03 16:12 ` [Buildroot] [PATCH 4/4] lua: support linenoise Francois Perrad
@ 2012-12-05 19:00   ` Peter Korsgaard
  0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2012-12-05 19:00 UTC (permalink / raw)
  To: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Committed, thanks (but see below).

 Francois> @@ -16,10 +16,16 @@ LUA_MYLIBS += -ldl
 Francois>  ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y)
 Francois>  	LUA_DEPENDENCIES = readline ncurses
 Francois>  	LUA_MYLIBS += -lreadline -lhistory -lncurses
 Francois> -	LUA_CFLAGS += -DLUA_USE_LINUX
 Francois> +	LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE

Why did you change LUA_USE_LINUX to LUA_USE_POSIX?


-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-05 19:00 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-03 16:12 [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Francois Perrad
2012-12-03 16:12 ` [Buildroot] [PATCH 2/4] luajit: bump to version 2.0.0 Francois Perrad
2012-12-05 16:39   ` Peter Korsgaard
2012-12-03 16:12 ` [Buildroot] [PATCH 3/4] linenoise: new package Francois Perrad
2012-12-05 16:42   ` Peter Korsgaard
2012-12-05 18:06     ` François Perrad
2012-12-03 16:12 ` [Buildroot] [PATCH 4/4] lua: support linenoise Francois Perrad
2012-12-05 19:00   ` Peter Korsgaard
2012-12-05 16:39 ` [Buildroot] [PATCH 1/4] perl: bump to version 5.16.2 Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.