Skip to contentSkip to conversation

luarocks: never wraps script

PATCH New Francois Perrad 3 participants 6 messages Feb 3, 2014

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 luarocks: never wraps script

the wrapper introduces some HOST_DIR paths on target

---
 package/luarocks/luarocks.mk |    1 +
 1 file changed, 1 insertion(+)
package/luarocks/luarocks.mk +1 -0
index 88ab22a..86e57d2 100644
@@ -37,6 +37,7 @@ define HOST_LUAROCKS_INSTALL_CMDS
 	echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }"  >> $(LUAROCKS_CONFIG_FILE)
 	echo "gcc_rpath = false"                                >> $(LUAROCKS_CONFIG_FILE)
 	echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }"          >> $(LUAROCKS_CONFIG_FILE)
+	echo "wrap_bin_scripts = false"                         >> $(LUAROCKS_CONFIG_FILE)
 endef
 
 $(eval $(host-generic-package))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 2/2 ljlinenoise: new package

---
 package/Config.in                  |    1 +
 package/ljlinenoise/Config.in      |   15 +++++++++++++++
 package/ljlinenoise/ljlinenoise.mk |   13 +++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/ljlinenoise/Config.in
 create mode 100644 package/ljlinenoise/ljlinenoise.mk
package/Config.in +1 -0
index 93d23cb..c757c68 100644
@@ -370,6 +370,7 @@ source "package/cgilua/Config.in"
 source "package/copas/Config.in"
 source "package/coxpcall/Config.in"
 source "package/lbase64/Config.in"
+source "package/ljlinenoise/Config.in"
 source "package/ljsyscall/Config.in"
 source "package/lua-cjson/Config.in"
 source "package/lua-ev/Config.in"
package/ljlinenoise/Config.in new file +15 -0
new file mode 100644
index 0000000..3d2af35
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LJLINENOISE
+	bool "ljlinenoise"
+	select BR2_PACKAGE_LJSYSCALL
+	# ljsyscall is specifically for LuaJIT, not Lua.
+	depends on BR2_PACKAGE_LUAJIT
+	# ljsyscall is only available for some target architectures
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb
+	help
+	  ljlinenoise is a pure LuaJIT port of linenoise,
+	  a small alternative to readline and libedit.
+
+	  http://fperrad.github.io/ljlinenoise/
+
+comment "ljlinenoise needs LuaJIT"
+	depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
package/ljlinenoise/ljlinenoise.mk new file +13 -0
new file mode 100644
index 0000000..69f6130
@@ -0,0 +1,13 @@
+################################################################################
+#
+# ljlinenoise
+#
+################################################################################
+
+LJLINENOISE_VERSION_UPSTREAM = 0.1.1
+LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
+LJLINENOISE_SUBDIR  = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
+LJLINENOISE_LICENSE = MIT
+LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT
+
+$(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v2 2/2 ljlinenoise: new package

Fran?ois, All,

A few nit-picks below...

On 2014-02-03 12:07 +0100, Francois Perrad spake thusly:

Quoted 1 line

[--SNIP--]

package/ljlinenoise/Config.in line 7

Quoted 13 lines
package/ljlinenoise/Config.in new file +7 -0
new file mode 100644
index 0000000..3d2af35
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LJLINENOISE
+	bool "ljlinenoise"
+	select BR2_PACKAGE_LJSYSCALL
+	# ljsyscall is specifically for LuaJIT, not Lua.
+	depends on BR2_PACKAGE_LUAJIT
+	# ljsyscall is only available for some target architectures
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb

No need for the comment, it is obvious from the dependency itself that ljlinenoise only works on these architectures.

However, it's maybe worth a comment in the commit log.

Quoted 14 lines
package/ljlinenoise/Config.in new file +8 -0
+	help
+	  ljlinenoise is a pure LuaJIT port of linenoise,
+	  a small alternative to readline and libedit.
+
+	  http://fperrad.github.io/ljlinenoise/
+
+comment "ljlinenoise needs LuaJIT"
+	depends on !BR2_PACKAGE_LUAJIT && (BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb)
package/ljlinenoise/ljlinenoise.mk new file +0 -0
new file mode 100644
index 0000000..69f6130

package/ljlinenoise/ljlinenoise.mk line 9

Quoted 9 lines
package/ljlinenoise/ljlinenoise.mk new file +9 -0
@@ -0,0 +1,13 @@
+################################################################################
+#
+# ljlinenoise
+#
+################################################################################
+
+LJLINENOISE_VERSION_UPSTREAM = 0.1.1
+LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
+LJLINENOISE_SUBDIR  = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
                     ^^

Very small nit-pick: only one space in front of the '=' sing.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 2/2 ljlinenoise: new package

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN
Quoted 8 lines
package/ljlinenoise/Config.in new file +2 -0
new file mode 100644
index 0000000..3d2af35
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LJLINENOISE
+	bool "ljlinenoise"
Quoted 8 lines

package/ljlinenoise/Config.in line 7

Quoted 5 lines
package/ljlinenoise/Config.in new file +5 -0
+	select BR2_PACKAGE_LJSYSCALL
+	# ljsyscall is specifically for LuaJIT, not Lua.
+	depends on BR2_PACKAGE_LUAJIT
+	# ljsyscall is only available for some target architectures
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb

No need for the comment, it is obvious from the dependency itself that ljlinenoise only works on these architectures.

Hum, really? These dependencies are inherited from ljsyscall, which is selected by this package. In such a situation, we normally do something like:

select BR2_PACKAGE_LIBGLIB2
depends on BR2_USE_WCHAR # libglib2

so having the same comment mentioned here makes sense, IMO, as it helps understanding where the architecture dependency is coming from.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH v2 2/2 ljlinenoise: new package

Thomas, Fran?ois, All,

On 2014-02-03 22:56 +0100, Thomas Petazzoni spake thusly:

Quoted 23 lines · Yann E. MORIN
Quoted 17 lines
Quoted 7 lines
package/ljlinenoise/Config.in new file +0 -0
new file mode 100644
index 0000000..3d2af35

package/ljlinenoise/Config.in line 7

Quoted 7 lines
package/ljlinenoise/Config.in new file +7 -0
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LJLINENOISE
+	bool "ljlinenoise"
+	select BR2_PACKAGE_LJSYSCALL
+	# ljsyscall is specifically for LuaJIT, not Lua.
+	depends on BR2_PACKAGE_LUAJIT
+	# ljsyscall is only available for some target architectures
+	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm || BR2_armeb

No need for the comment, it is obvious from the dependency itself that ljlinenoise only works on these architectures.

Hum, really? These dependencies are inherited from ljsyscall, which is selected by this package. In such a situation, we normally do something like:

Quoted 5 lines

select BR2_PACKAGE_LIBGLIB2
depends on BR2_USE_WCHAR # libglib2

so having the same comment mentioned here makes sense, IMO, as it helps understanding where the architecture dependency is coming from.

OK, my bad, I misread 'ljlinenoise' when 'ljsyscall' was properly written.

Forget what I said about this. Sorry for the noise. As Thomas said, just post-fix the depends with '# ljsyscall'.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH v2 1/2 luarocks: never wraps script

In reply to Francois Perrad

Franc?ois, All,

On 2014-02-03 12:07 +0100, Francois Perrad spake thusly:

Quoted 1 line

the wrapper introduces some HOST_DIR paths on target

Can you explain a bit more in details what this wrapper is, and why we do not want it (besides the fact it uses HOST_DIR paths on the target)?

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'